merge of 4aeadc5b624f802be51ae097db69e1b49194e1df
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 13 Jan 2006 11:56:12 +0000 (11:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 11:56:12 +0000 (11:56 +0000)
     and 8fb9f22bce3a16f84e10839a92c8b55f7329a5c7


Trivial merge