merge of 1d8a85d29d23285494e2dc937981b14cd0907e19
authorKoen Kooi <koen@openembedded.org>
Tue, 20 Dec 2005 11:59:01 +0000 (11:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Dec 2005 11:59:01 +0000 (11:59 +0000)
     and e8e7132af4a76b95599213aafdc96c7e0f61582a


Trivial merge