merge of 3c51b3a56df4d11fa759fd5ddbaf3fd02c7ac250
authorMichael Lauer <mickey@vanille-media.de>
Sat, 10 Jun 2006 11:20:56 +0000 (11:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Jun 2006 11:20:56 +0000 (11:20 +0000)
     and a11a9b2115534b69d4caed3521f23c8da3c2c11f


Trivial merge