merge of 887360a0dd0ab194c55c98aec0baaf069e32fe47
authorMichael Lauer <mickey@vanille-media.de>
Sat, 6 May 2006 16:57:37 +0000 (16:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 May 2006 16:57:37 +0000 (16:57 +0000)
     and a13924bae0fe62a4c39522bed9d21b03032f0d8a


Trivial merge