merge of 0b9d1fff00de0e6e3607281ba24e99cc229cda94
authorKoen Kooi <koen@openembedded.org>
Tue, 20 Dec 2005 16:31:46 +0000 (16:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Dec 2005 16:31:46 +0000 (16:31 +0000)
     and a762683ec16bf4a36932c939cfa45b55ea5dfff1


Trivial merge