merge of 0b32c3262ef809324fd2b1cf3daffb33589fe68c
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Jul 2006 10:20:17 +0000 (10:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Jul 2006 10:20:17 +0000 (10:20 +0000)
     and 7bffbf2364668b2cd3e8ca978561a2cf01152db1


Trivial merge