merge of 609271c40b312ab6442f49fa8fcf91b9de016933
authorMichael Lauer <mickey@vanille-media.de>
Mon, 12 Sep 2005 10:23:32 +0000 (10:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Sep 2005 10:23:32 +0000 (10:23 +0000)
     and ad9133020a1a5b111af22c9ecb30c8ce1e428169


Trivial merge