merge of 4083811b8032d3a372f6aed8c3f16991920880f6
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Jul 2005 10:39:52 +0000 (10:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Jul 2005 10:39:52 +0000 (10:39 +0000)
     and d9ca92efbd74f689ba06fe1757077c9e5dd12f0c


Trivial merge