merge of 659f1b6f8d68752f4656f3cbc2491ec0fed162d2
authorKoen Kooi <koen@openembedded.org>
Sun, 24 Jul 2005 17:10:22 +0000 (17:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 17:10:22 +0000 (17:10 +0000)
     and 7ca35ae8ca6e236e331175d9f5164f0a0f663f57


Trivial merge