merge of 211d3eafdbedbb4a02100687b6b195ac48fe2a02
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Jul 2005 12:12:10 +0000 (12:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 12:12:10 +0000 (12:12 +0000)
     and d04c0208dfd4f8f9e4636ab4a192f056e6a1cf63


Trivial merge