merge of 4af0b1bc6131703de0850a30751d772f9d2ae229
authorMichael Lauer <mickey@vanille-media.de>
Tue, 23 May 2006 08:55:08 +0000 (08:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 May 2006 08:55:08 +0000 (08:55 +0000)
     and cd46d30fbd05c83e7220c5e12d66f1620255ad00


Trivial merge