Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 22 May 2010 19:31:27 +0000 (21:31 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 22 May 2010 19:31:27 +0000 (21:31 +0200)

Trivial merge