merge of 39a66ef7f4c4fa168070a43466472921e43df04d
authorKoen Kooi <koen@openembedded.org>
Tue, 20 Dec 2005 12:22:34 +0000 (12:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Dec 2005 12:22:34 +0000 (12:22 +0000)
     and fa51703129c94d391a49cd73b3663c986c5c7314


Trivial merge