merge of 183a7abb14b61cce40ef9860783b1523f0caa0cd
authorMichael Lauer <mickey@vanille-media.de>
Tue, 9 May 2006 14:21:10 +0000 (14:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 May 2006 14:21:10 +0000 (14:21 +0000)
     and 579c05403bf5a71c89a55a696898f027db224a5e


Trivial merge