merge of 630804513aa5dc09552fa2067802f3f4dcbd6fe1
authorMichael Lauer <mickey@vanille-media.de>
Tue, 12 Jul 2005 19:52:44 +0000 (19:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Jul 2005 19:52:44 +0000 (19:52 +0000)
     and 95c407f44e651c205d21b7df9b1cb6afe48f9508


Trivial merge