merge of 542b1a3d999b25674ade56ded685c4211f27090f
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 5 May 2006 15:47:10 +0000 (15:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 May 2006 15:47:10 +0000 (15:47 +0000)
     and b69c981e27fd4ef4c385796d80f1095b8859ce1c


Trivial merge