merge of 2e750f1fb2ff29c22b1870939bd30694fa946cb9
authorKoen Kooi <koen@openembedded.org>
Wed, 5 Jul 2006 12:13:24 +0000 (12:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 12:13:24 +0000 (12:13 +0000)
     and 6261935e463d6a8bd4cbd2436a1aea7030843591


Trivial merge