Merge branch 'master' into newinterface
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 17 Apr 2012 09:44:56 +0000 (11:44 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 17 Apr 2012 09:44:56 +0000 (11:44 +0200)

Trivial merge