Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 31 Jan 2012 16:01:33 +0000 (17:01 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 31 Jan 2012 16:01:33 +0000 (17:01 +0100)

Trivial merge