Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Thu, 4 Aug 2011 11:24:39 +0000 (13:24 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Thu, 4 Aug 2011 11:24:39 +0000 (13:24 +0200)
commit34f0505d1f36de9eca995fa8922e1399bf711234
treea15f6464eec67a512fbbe2cde2766694ffab910c
parentc394720d3a6ab3e3712458b822ec067575b3f74e
parent8ad475645e1fe47c3c0a2eb8afb19a2ff79bf08e
Merge with head