merge of 7bd820c4a7bbdcb47264fd60a48b7099177d4859
authorMichael Lauer <mickey@vanille-media.de>
Wed, 12 Jul 2006 12:04:36 +0000 (12:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 12:04:36 +0000 (12:04 +0000)
     and 87830c48ea8ea7120ce229524f7ab20d869b1e31


Trivial merge