Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 16 Jun 2011 06:18:11 +0000 (08:18 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 16 Jun 2011 06:18:11 +0000 (08:18 +0200)

Trivial merge