merge of 3ce424d5d8f31e0ba22a3979298d97c8a37e4f4a
authorKoen Kooi <koen@openembedded.org>
Thu, 18 May 2006 12:48:07 +0000 (12:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 May 2006 12:48:07 +0000 (12:48 +0000)
     and 8e42a3791620b4411df47a038ef0451b2fbd4432


Trivial merge