merge of 7f1a36bb348422ee0ee7643b6c8090a43f6900f4
authorMichael Lauer <mickey@vanille-media.de>
Wed, 27 Jul 2005 23:18:57 +0000 (23:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jul 2005 23:18:57 +0000 (23:18 +0000)
     and 94f303eda501c5ec8e20584ef29de2ce84bf8ed7


Trivial merge