merge of 3bb8b4ecf78d2acc4e8cd5cddaafc4e0386dab93
authorMichael Lauer <mickey@vanille-media.de>
Fri, 21 Apr 2006 10:08:50 +0000 (10:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 21 Apr 2006 10:08:50 +0000 (10:08 +0000)
     and 5a91a3e083f4ba2c925d3ef91b37a2d5b3387ad0


Trivial merge