Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 14 Nov 2011 09:17:22 +0000 (10:17 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 14 Nov 2011 09:17:22 +0000 (10:17 +0100)

Trivial merge