merge of 348f3f6524cd73a696d15a5f3d04dd4c89b66fdf
authorMichael Lauer <mickey@vanille-media.de>
Tue, 1 Nov 2005 15:44:04 +0000 (15:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Nov 2005 15:44:04 +0000 (15:44 +0000)
     and f99c13adcfcf9d39261b5888ee3a2e9e5700bc83


Trivial merge