merge of 407bf0fc9b07e2530a5ccf8399950eab802626c0
authorMichael Lauer <mickey@vanille-media.de>
Fri, 9 Jun 2006 01:29:19 +0000 (01:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Jun 2006 01:29:19 +0000 (01:29 +0000)
     and 79d9baa2d56d813cea89497804b8c97f5d079df7


Trivial merge