merge of 621bf027644015319adb51145e07f9d6e3195b93
authorMichael Lauer <mickey@vanille-media.de>
Mon, 3 Jul 2006 12:03:11 +0000 (12:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 12:03:11 +0000 (12:03 +0000)
     and c7701984b00dc8815849c8332b5967f4c9a81ab2


Trivial merge