Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 Jun 2010 10:45:39 +0000 (12:45 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 Jun 2010 10:45:39 +0000 (12:45 +0200)

Trivial merge