merge of 371519ee16090c31f871dd775b4e4d1660ac9b5a
authorMichael Lauer <mickey@vanille-media.de>
Mon, 5 Jun 2006 19:19:18 +0000 (19:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Jun 2006 19:19:18 +0000 (19:19 +0000)
     and 58064edf80749f708183ec81472dc2950f816a94


Trivial merge