merge of 8df72580b7878605ca810af37d8e7d549d912e3f
authorKoen Kooi <koen@openembedded.org>
Thu, 28 Jul 2005 14:25:03 +0000 (14:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 14:25:03 +0000 (14:25 +0000)
commit166ffd6bfce2a08fe45ad2c4ef20628031ac8dbf
treeb0ad6acd7f1242325f13b811daf760a8f615ec65
parent895d1ab903da35a150911f4a42d3dc629ec3b5f7
parent0ededd3186263bb24ff9c4ca44a8003438a4d0fe
merge of 8df72580b7878605ca810af37d8e7d549d912e3f
     and f58d6b029802b7b251814cf78a19963b63a0d9fa