merge of 62f17dde6e02af42bf4eab7e425978b66cea3823
authorMichael Lauer <mickey@vanille-media.de>
Thu, 4 Aug 2005 16:14:36 +0000 (16:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Aug 2005 16:14:36 +0000 (16:14 +0000)
     and 7b0d9a3014b9a4ec491547577decf4b403df8b04


Trivial merge