merge of 57ac60221ec66341d6031290ebe0ea39dea0b9c7
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Apr 2006 15:27:00 +0000 (15:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 15:27:00 +0000 (15:27 +0000)
     and 9e2b0b36ac437fa39c2d640705951c444373f8c8


Trivial merge