Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 11 Mar 2011 17:19:19 +0000 (18:19 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 11 Mar 2011 17:19:19 +0000 (18:19 +0100)

Trivial merge