merge of 93f6aca0335dace467591d3dbba7c7852abfd438
authorMichael Lauer <mickey@vanille-media.de>
Wed, 17 May 2006 11:22:00 +0000 (11:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 May 2006 11:22:00 +0000 (11:22 +0000)
     and 95448ac3b9d96ecd3141adff3929eb344db65a93


Trivial merge