From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 20 Mar 2008 06:25:41 +0000 (+0000)
Subject: merge
X-Git-Tag: Release-2010-05/1~7106^2^2~3^2^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a01774a7dabfb14bfeab0d900113c206afef853;p=openembedded.git

merge
---

diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
similarity index 100%
rename from packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge
rename to packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb