merge of 54fc43a41a444cc06b399d28786e681cc3f280b0
authorKoen Kooi <koen@openembedded.org>
Mon, 3 Jul 2006 11:47:09 +0000 (11:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 11:47:09 +0000 (11:47 +0000)
commitdeb7c0557bd30de7117ac42147292c07891a85e8
tree14b6769a340a7fa795113e534cf7317a5d2f6247
parentdd4fb149e32dcf1d3505d72c7887c9f8a0cc98ef
parent879bf61864692b861913e124ea4f9dacd0c43200
merge of 54fc43a41a444cc06b399d28786e681cc3f280b0
     and e2cab234562f7dda172baed70a2d13541d0c63ff