Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 24 Mar 2011 21:49:29 +0000 (22:49 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 24 Mar 2011 21:49:29 +0000 (22:49 +0100)

Trivial merge