Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Mon, 4 Jul 2011 10:59:53 +0000 (12:59 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Mon, 4 Jul 2011 10:59:53 +0000 (12:59 +0200)
commitb9d345f059551f1681a0b3597b33d58b11d8e12c
treeab3f08e36411ee1a2a9a4c674edcc06fa5e07e67
parent603d0ae6c67a2c4487be193a265e7755fe3a5470
parent86d4183bac77a1578713b2c17483721840934f62
Merge with head