merge of 74324a04301a770e8af5057b86f0d17b225b6d0f
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Jul 2006 12:33:25 +0000 (12:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Jul 2006 12:33:25 +0000 (12:33 +0000)
     and fa3fb685758862d7a61d1fa76cd38523291a05fe


Trivial merge