Merge branch 'master' into sfa-geni-v3
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 17 Apr 2013 11:41:19 +0000 (13:41 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 17 Apr 2013 11:41:19 +0000 (13:41 +0200)

Trivial merge