merge of 78c141426ac25a36e8345e703ee6eb3f523b2e69
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Jul 2006 14:40:31 +0000 (14:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 14:40:31 +0000 (14:40 +0000)
     and 7bdc9a56f17551347d3b0b1a957cdb1e1429e3ba


Trivial merge