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

Trivial merge