merge of 24be272ea8c07c7b0b690d8be9589681925c037b
authorMichael Lauer <mickey@vanille-media.de>
Wed, 12 Apr 2006 17:37:06 +0000 (17:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Apr 2006 17:37:06 +0000 (17:37 +0000)
     and 4b742ad8af89b3c75d8c6bc198ef09f0509fe642


Trivial merge