Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 8 May 2011 08:21:46 +0000 (10:21 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 8 May 2011 08:21:46 +0000 (10:21 +0200)

Trivial merge