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

Trivial merge