merge of c0cfa6456fcf9d90a45c2a15139dcb2414db2c03
authorMichael Lauer <mickey@vanille-media.de>
Sat, 20 May 2006 18:24:39 +0000 (18:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 May 2006 18:24:39 +0000 (18:24 +0000)
     and f79576d9b9c2a65a2e9e5b3d7b7f1d4a57ea892a


Trivial merge