merge of 608719661f2b529992817aca005186cc9ffd5807
authorMichael Lauer <mickey@vanille-media.de>
Tue, 12 Jul 2005 10:50:07 +0000 (10:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Jul 2005 10:50:07 +0000 (10:50 +0000)
     and 70aa3da0eaab1da0ad6716e4284a19687ea7492a


Trivial merge