Merge branch 'master' of ssh://git.onelab.eu/git/sface
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 15 Mar 2011 10:22:39 +0000 (11:22 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 15 Mar 2011 10:22:39 +0000 (11:22 +0100)

Trivial merge