merge of 862947fc7ef9b740fb666cce1351ba7df1cf9ca8
authorMichael Lauer <mickey@vanille-media.de>
Sun, 11 Jun 2006 15:33:31 +0000 (15:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Jun 2006 15:33:31 +0000 (15:33 +0000)
     and e07cef00a7e452974d1c0ccfec2dea932a539ade


Trivial merge