Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Thu, 21 Jul 2011 12:21:56 +0000 (14:21 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Thu, 21 Jul 2011 12:21:56 +0000 (14:21 +0200)
commit742bd08c935b3f7f033badbd2c4712e760ec73e1
tree54020273da80029fe0110b98e1caa68825a2f4c1
parent4a998bd3744adca0b1b8346558e017858a48e626
parent72ae99539ca792fdb90ca8e1fae437ea80375ddb
Merge with head