Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 18 Jul 2012 15:01:56 +0000 (17:01 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 18 Jul 2012 15:01:56 +0000 (17:01 +0200)

Trivial merge