merge of 079fcd329857f0a9c2515a187110ac87377cafd1
authorKoen Kooi <koen@openembedded.org>
Wed, 10 May 2006 19:06:25 +0000 (19:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 May 2006 19:06:25 +0000 (19:06 +0000)
     and 283024b09313f04ab41944556c579e5bedba69c3


Trivial merge