merge of 141e00dd91cb49e23b2a89cccc771cfad2f10a66
authorMichael Lauer <mickey@vanille-media.de>
Sun, 3 Jul 2005 18:08:49 +0000 (18:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 18:08:49 +0000 (18:08 +0000)
     and d5dab43c1d771f3066ddfb0268e9603d672e5336


Trivial merge