merge of 12c8ec6ea03d7bf942717daba4cc06fd518965c0
authorMichael Lauer <mickey@vanille-media.de>
Wed, 17 May 2006 22:20:00 +0000 (22:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 May 2006 22:20:00 +0000 (22:20 +0000)
     and f46af8d8602581214b59314f71fbd9fcdfda0fef


Trivial merge