merge of 383f54bb340ef9be1fdf7241b922566502b40e1e
authorMichael Lauer <mickey@vanille-media.de>
Wed, 10 May 2006 18:36:41 +0000 (18:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 May 2006 18:36:41 +0000 (18:36 +0000)
     and a3dbfe01cde42b68cf450e18651fe60be57fe1bb


Trivial merge