merge of 8032192230077b09d16100e880211ea479093f78
authorMichael Lauer <mickey@vanille-media.de>
Tue, 30 Aug 2005 15:27:09 +0000 (15:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 15:27:09 +0000 (15:27 +0000)
     and faeb226ffa7dd02ce2545a3a8b5ab0069e72e91a


Trivial merge