merge of b1413be68019496f10dcfa8c854fd6644adecd93
authorMichael Lauer <mickey@vanille-media.de>
Sat, 17 Jun 2006 14:12:24 +0000 (14:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 Jun 2006 14:12:24 +0000 (14:12 +0000)
     and f7ac7bd5a0590c19bff764ae19b67122b71ac9ac


Trivial merge