merge of 8ff944953434311b09f162dfad1932c2c1222d7e
authorMichael Lauer <mickey@vanille-media.de>
Mon, 5 Sep 2005 18:05:02 +0000 (18:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Sep 2005 18:05:02 +0000 (18:05 +0000)
     and b3d467de4bd859eaa9c1dc56ad7792a6ae15cca1


Trivial merge