Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 22 Jun 2011 15:14:48 +0000 (17:14 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 22 Jun 2011 15:14:48 +0000 (17:14 +0200)
commit5c13c5dacdb4213b865302f4ac104971ede43ed3
tree4c38463b18b9fce809998f26fcd16f3dc6b1430d
parent7306c27230a7652cb6d7e4fb59dcc855740874ac
parentec66d1be74f0238bb1bcca115655099fb2cf8665
Merge with head