merge of 470f2685dfe5cb3786786067c1edf1282dd1c536
authorMichael Lauer <mickey@vanille-media.de>
Sat, 23 Jul 2005 20:00:48 +0000 (20:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Jul 2005 20:00:48 +0000 (20:00 +0000)
     and 50481fac31a3c89de7959f87001b670c05ea5e7a


Trivial merge