Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 18 Jun 2010 07:35:18 +0000 (09:35 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 18 Jun 2010 07:35:18 +0000 (09:35 +0200)

Trivial merge