merge of 2c58b60e1d3b3e6180e692b5ecb380645848d3f6
authorMichael Lauer <mickey@vanille-media.de>
Mon, 26 Jun 2006 13:32:10 +0000 (13:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Jun 2006 13:32:10 +0000 (13:32 +0000)
     and d720748eefecadc42fdb329ec2dd5eea284c11ba


Trivial merge