Merge branch 'master' of ssh://git.onelab.eu/git/sface
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 16 Mar 2011 11:01:28 +0000 (12:01 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 16 Mar 2011 11:01:28 +0000 (12:01 +0100)

Trivial merge