merge of 9fc1b3192dc4460c4d2e5e2d6f59a93d53fa35f2
authorMichael Lauer <mickey@vanille-media.de>
Fri, 9 Jun 2006 14:59:22 +0000 (14:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Jun 2006 14:59:22 +0000 (14:59 +0000)
     and c548c6456e349f38c0e231a616cca1f80081fcfe


Trivial merge