merge of 18847e62fc2cebf8bf5fbc961455a822595bd286
authorMichael Lauer <mickey@vanille-media.de>
Tue, 12 Jul 2005 19:38:56 +0000 (19:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 12 Jul 2005 19:38:56 +0000 (19:38 +0000)
     and 6c3b68859e9aa7efedb7c4086501226686cad2cc


Trivial merge