merge of 2d6d863c36fd1d9d7ab0dba3d700e0f1ccf122be
authorMichael Lauer <mickey@vanille-media.de>
Thu, 25 May 2006 21:32:15 +0000 (21:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 May 2006 21:32:15 +0000 (21:32 +0000)
     and 5429025616a252862aead1378c8075987190a85a


Trivial merge