merge of 085d7150845adc7b63d27d8e1468741c72a3561b
authorMichael Lauer <mickey@vanille-media.de>
Wed, 22 Mar 2006 18:17:16 +0000 (18:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Mar 2006 18:17:16 +0000 (18:17 +0000)
     and 48c734b5e2a4506518472e70e77b4699c76a92b3


Trivial merge