From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 4 Jul 2006 09:47:33 +0000 (+0000)
Subject: merge of 048984452e3625e7ebd5e99419f289d1ea6a9d40
X-Git-Tag: Release-2010-05/1~9453^2~1345^2~8^2~9^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4529f12ab4c495e6d4790814f31a46b33ceca1e7;p=openembedded.git

merge of 048984452e3625e7ebd5e99419f289d1ea6a9d40
     and b160064c666a513a6ec76f7fd0ddbd5ee1d7a985
---

4529f12ab4c495e6d4790814f31a46b33ceca1e7