merge of a85c8bb53604e3bd7a5ae3d8b5eb3f084798e061
authorMichael Lauer <mickey@vanille-media.de>
Sat, 6 Aug 2005 11:34:32 +0000 (11:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 Aug 2005 11:34:32 +0000 (11:34 +0000)
     and fb1746edef94a5e7e29a7b45e8455f288181530c


Trivial merge