merge of 8f81c821d4522c9367e23584313e4bbf36557144
authorMichael Lauer <mickey@vanille-media.de>
Wed, 5 Jul 2006 10:32:02 +0000 (10:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 10:32:02 +0000 (10:32 +0000)
     and aa68ff4c40aba03b1dd84c1e7efb9788ba509f51


Trivial merge