Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 20 Oct 2011 17:15:35 +0000 (19:15 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 20 Oct 2011 17:15:35 +0000 (19:15 +0200)

Trivial merge