merge of 69894987a74901f755f23dcc5ff02467692a1d81
authorMichael Lauer <mickey@vanille-media.de>
Sat, 6 Aug 2005 23:54:42 +0000 (23:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 Aug 2005 23:54:42 +0000 (23:54 +0000)
     and fc974e9671578c44c3b488a5ab0f5eb31d1ea9bf


Trivial merge