Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 26 Sep 2010 12:18:35 +0000 (14:18 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 26 Sep 2010 12:18:35 +0000 (14:18 +0200)

Trivial merge