Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Thu, 6 Oct 2011 00:34:11 +0000 (02:34 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Thu, 6 Oct 2011 00:34:11 +0000 (02:34 +0200)
commitfc0dafbf66bddccfd99ad22f7cac06ffbd82e538
treeda0cb3280286fe545730f4b0100a39fbb5b43a72
parentb13e9ae1d457f30e091aad70ae958ed94bb1ec5c
parent0874a891ee1a0803e2695602447d2d0d320e8af9
Merge with head