merge of 868246069be482bc64e4d7bd013d7a0df35de286
authorMichael Lauer <mickey@vanille-media.de>
Thu, 11 May 2006 16:20:30 +0000 (16:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 16:20:30 +0000 (16:20 +0000)
     and e4d2a954ceceaa23fece37507c8e7f43cfbf1047


Trivial merge