merge of 8abbcea495957d422ccb84ed43b0802a81601b3a
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 4 Jul 2006 10:29:38 +0000 (10:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 10:29:38 +0000 (10:29 +0000)
     and aad68da8854e5512132ee6366a57181078e5812d


Trivial merge