Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 1 Sep 2010 22:04:43 +0000 (00:04 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 1 Sep 2010 22:04:43 +0000 (00:04 +0200)

Trivial merge