merge of 784fefbad71c3505470368a578f10f698b47068d
authorMichael Lauer <mickey@vanille-media.de>
Mon, 24 Apr 2006 11:59:06 +0000 (11:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 11:59:06 +0000 (11:59 +0000)
     and d28fb7268cf69c4ca2450e6581fb928a7027f78e


Trivial merge