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)
commit135d7c612a713db6d6180623b8c4f68499b9ab2e
treeb7b29cd3a42559180e6cc065b3376f7765169b27
parent8b8b59d12e2970dfb10ee939c06283a553d24571
parent39867aaf0dad522d85931b374b944171568e6ff1
merge of 348f3f6524cd73a696d15a5f3d04dd4c89b66fdf
     and f99c13adcfcf9d39261b5888ee3a2e9e5700bc83