merge of 25db80bea462a7241e31b8a78ccf8333e59e1160
authorKoen Kooi <koen@openembedded.org>
Tue, 8 Nov 2005 16:26:43 +0000 (16:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Nov 2005 16:26:43 +0000 (16:26 +0000)
     and e911b6055dc1d7acc7b1dea7abe6d6df87db4f8f


Trivial merge