[oe-commits] org.oe.dev merge

[xora commit]

merge

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 25a0ed0729c8e42822ca420c9bacaea39f33ccc7
ViewMTN: http://monotone.openembedded.org/revision/info/25a0ed0729c8e42822ca420c9bacaea39f33ccc7
Files:
1
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
Diffs:

#
# mt diff -raab298e272ed2f557fab2492b288810388faf422 -r25a0ed0729c8e42822ca420c9bacaea39f33ccc7
#
#
#
# rename "packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge"
#     to "packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb"
#