Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 13 May 2012 21:24:41 +0000 (23:24 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 13 May 2012 21:24:41 +0000 (23:24 +0200)

Trivial merge