merge of 54fc43a41a444cc06b399d28786e681cc3f280b0
authorKoen Kooi <koen@openembedded.org>
Mon, 3 Jul 2006 11:47:09 +0000 (11:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 11:47:09 +0000 (11:47 +0000)
     and e2cab234562f7dda172baed70a2d13541d0c63ff


Trivial merge