merge of 905c8d454a8f78a32652b51edb7d9fc32edc640b
authorMichael Lauer <mickey@vanille-media.de>
Mon, 18 Jul 2005 08:15:26 +0000 (08:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Jul 2005 08:15:26 +0000 (08:15 +0000)
     and 92e1739bb87cfcdf66038f7860c960bac859d2d1


Trivial merge