merge of c24a7375060d5ad599851af14ea91bce14d3092b
authorMichael Lauer <mickey@vanille-media.de>
Mon, 3 Jul 2006 17:25:47 +0000 (17:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 17:25:47 +0000 (17:25 +0000)
     and d590807735761852af55b2d7ebce85ba1dcd42d1


Trivial merge