Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 13 Dec 2011 15:45:35 +0000 (16:45 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 13 Dec 2011 15:45:35 +0000 (16:45 +0100)

Trivial merge