Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 12 May 2012 16:56:19 +0000 (18:56 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 12 May 2012 16:56:19 +0000 (18:56 +0200)

Trivial merge