merge of 40ab23b1b8e8e478cc075a3795e981566f038498
authorMichael Lauer <mickey@vanille-media.de>
Fri, 1 Jul 2005 16:26:41 +0000 (16:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Jul 2005 16:26:41 +0000 (16:26 +0000)
     and 9c553d474bbf69d1431bf54db66c846273c33008


Trivial merge