Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 24 Jul 2010 06:45:14 +0000 (08:45 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 24 Jul 2010 06:45:14 +0000 (08:45 +0200)

Trivial merge