merge of 60b47beac72c6f1f23514b42a309716b470d471b
authorMichael Lauer <mickey@vanille-media.de>
Wed, 20 Jul 2005 21:48:43 +0000 (21:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jul 2005 21:48:43 +0000 (21:48 +0000)
     and 7fbbef1848aa08b7ef6e7a00db436c1db5c2002e


Trivial merge