merge of 1c2bc7bfcd2c35cb60327cf7d30eae444c422cd5
authorKoen Kooi <koen@openembedded.org>
Tue, 8 Nov 2005 12:05:56 +0000 (12:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Nov 2005 12:05:56 +0000 (12:05 +0000)
     and bc093cfefa7d27266ba48a9cd3cd1ea47a251499


Trivial merge