merge of 751202dec5e87f8d2890ebfa4eda6fc01be383dd
authorMichael Lauer <mickey@vanille-media.de>
Tue, 18 Oct 2005 08:59:53 +0000 (08:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Oct 2005 08:59:53 +0000 (08:59 +0000)
     and 7aa0e0efab18c8baf78ca2412e3d5602bf2252fc


Trivial merge