merge of 7ee1ffcec438245a0a1840156021aef8230bb7e0
authorMichael Lauer <mickey@vanille-media.de>
Sat, 13 May 2006 12:57:11 +0000 (12:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 May 2006 12:57:11 +0000 (12:57 +0000)
     and d3c6eb18e534ee6e6046f023f47fd31a50959d3b


Trivial merge