Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 27 Sep 2011 02:03:18 +0000 (04:03 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 27 Sep 2011 02:03:18 +0000 (04:03 +0200)
commitd9d48c3f87d8a573d0af27c27004c861af9a1bb3
treee47406602170008e616ef882ae1696568bc2104e
parent9f9b0684ec1f75bfb477bec6b583433cf89ec2b0
parentc3a3018f361aabf9f3d8ad13e20a231344a03e42
Merge with head