merge of 3a90bb2a96133732a5f60c88043d4ec81591720c
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 2 Jul 2005 00:07:11 +0000 (00:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 2 Jul 2005 00:07:11 +0000 (00:07 +0000)
     and 8e63001b71c44d7180fad5cb696c1f236ca499bf


Trivial merge