merge of 41ccdaa6ccec1fc3dd5467a321a4920945f4a673
authorMichael Lauer <mickey@vanille-media.de>
Fri, 12 Aug 2005 13:59:08 +0000 (13:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 Aug 2005 13:59:08 +0000 (13:59 +0000)
     and f79035e45efd4ec295a4f073b25a42193a9cda7b


Trivial merge