solve merge conflict
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 31 Oct 2011 18:31:42 +0000 (19:31 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 31 Oct 2011 18:31:42 +0000 (19:31 +0100)
commitf11dae03d2dc79be445c9a604c9c7fc4b222d98d
tree2c6d6c681d5169aa46dc32ad167f69d8158b6cb1
parent1a4bcb040b5223cd23bf7219337215f16533f812
parentfec2b28c6334bf364e05722f624ff6c94f6d50b6
solve merge conflict