merge of 1490f8928e0cfffa303986d8c99a542436047d2c
authorKoen Kooi <koen@openembedded.org>
Thu, 28 Jul 2005 14:22:25 +0000 (14:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 14:22:25 +0000 (14:22 +0000)
     and 51c9e09a8058432d791104e8438490931766eae3


Trivial merge