Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 27 Jul 2011 14:01:38 +0000 (16:01 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 27 Jul 2011 14:01:38 +0000 (16:01 +0200)
commit48c75c29e83c047d9d5a2ab9d911a449c78fc70b
tree5d6fdda082caca697822ed562f841f465fb55ed8
parentaa8131d6fed5ba328788e906d2613d76a291ccb0
parent1ae70db7a15604d0fe9fed5443ccab3ab5a522a7
Merge with head