merge of 42b8c7920b08e37a6ea01ca90bfdc0e0aa4c2759
authorMichael Lauer <mickey@vanille-media.de>
Fri, 12 May 2006 20:22:26 +0000 (20:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 May 2006 20:22:26 +0000 (20:22 +0000)
     and b4da6e3e315557823da6a4486c8fb7ab3d82ab8a


Trivial merge