merge of 856181643b2a33fbd80da145f003dc111c407d9e
authorKoen Kooi <koen@openembedded.org>
Sat, 23 Jul 2005 00:08:12 +0000 (00:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Jul 2005 00:08:12 +0000 (00:08 +0000)
     and a09cb27506f56d7b4d048f4d60c7df2e11968692


Trivial merge