merge of 68dc68630ef5f8cb5f392a2b722b9e4df487594d
authorMichael Lauer <mickey@vanille-media.de>
Mon, 2 Jan 2006 16:14:05 +0000 (16:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Jan 2006 16:14:05 +0000 (16:14 +0000)
     and e3e867b6681848568f2694833afb3a3a08b8fa48


Trivial merge