merge of 37906cae8de28e3888cce307d6dbdab279f57164
authorKoen Kooi <koen@openembedded.org>
Wed, 8 Feb 2006 10:24:17 +0000 (10:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 10:24:17 +0000 (10:24 +0000)
commitaf00561e27a9d0c8038f2b1fd695e83e3b300ca1
tree9e09368cd2fbeb93e2643cc9c3d4d1e70b9b4313
parent1639b5dab8efc2d6d791db6b024a53e66b49ec9a
parentfbcd6d1582c86892d7d662216df713bd9db04d4e
merge of 37906cae8de28e3888cce307d6dbdab279f57164
     and f076172bf11be4df22001e51898b11d9f9e2050d