merge of b910f2201c5aba208eedfb5ec07c0d6a245ef6ae
authorMichael Lauer <mickey@vanille-media.de>
Wed, 5 Jul 2006 10:51:38 +0000 (10:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 10:51:38 +0000 (10:51 +0000)
     and cc177b76c6de45f8a6dc0ceca028319d4e6126d2


Trivial merge