merge of 45a5427b6f0cf6bd9348091b9a3207186c8f7ec2
authorMichael Lauer <mickey@vanille-media.de>
Tue, 25 Apr 2006 21:49:21 +0000 (21:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 21:49:21 +0000 (21:49 +0000)
     and 8ece4b6d66be2e1540ebb969513da31e4970d3a0


Trivial merge