Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 27 Jan 2011 18:27:20 +0000 (19:27 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 27 Jan 2011 18:27:20 +0000 (19:27 +0100)

Trivial merge