merge of 2ee92374446758a6e4eb30e6b81483816ae44575
authorMichael Lauer <mickey@vanille-media.de>
Wed, 28 Sep 2005 14:08:04 +0000 (14:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Sep 2005 14:08:04 +0000 (14:08 +0000)
     and ac0f7cef89d03ac964eee9b5bee66880b7943389


Trivial merge