Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Sun, 2 Oct 2011 19:10:58 +0000 (21:10 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Sun, 2 Oct 2011 19:10:58 +0000 (21:10 +0200)
commit8a6bc695cec6ee8b8aa0199ddefb036eb382c444
tree9977e324b8c7d6202a5350508ffd0a3cac4f3e39
parent15df39406518550abe2e385a11096a17a8a3f83c
parent203b596db5be0a3bde9ca5e1ce7728c83e7b2382
Merge with head