Merge branch 'master' of ssh://git.onelab.eu/git/sface
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 17 Sep 2010 15:26:09 +0000 (17:26 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 17 Sep 2010 15:26:09 +0000 (17:26 +0200)

Trivial merge