merge of bc8ebabb26be6b1995dede187f84d76cb364c344
authorMichael Lauer <mickey@vanille-media.de>
Tue, 16 Aug 2005 13:36:09 +0000 (13:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Aug 2005 13:36:09 +0000 (13:36 +0000)
     and de31bae9925b81f8c7cff9b208bebeffced17654


Trivial merge