merge of 12aa0c8ab97e48e880104ae70099396cfec730d0
authorMichael Lauer <mickey@vanille-media.de>
Mon, 12 Jun 2006 17:28:05 +0000 (17:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Jun 2006 17:28:05 +0000 (17:28 +0000)
     and 91a1b03bc990317ac44a440b58f5e1b171fc7234


Trivial merge