merge of 35bf847ec624a472e7754b8b62294721f8d0d281
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 4 Feb 2006 00:06:36 +0000 (00:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Feb 2006 00:06:36 +0000 (00:06 +0000)
     and a2bad5c04285fc3770315adbf676c5448eba58e5


Trivial merge