merge of 442f062be604dc778760de19d17e0429b815330f
authorMichael Lauer <mickey@vanille-media.de>
Thu, 25 Aug 2005 14:15:39 +0000 (14:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 14:15:39 +0000 (14:15 +0000)
     and aefd8b85d8866ff05ae03c31658567c0a0d18d11


Trivial merge