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

Trivial merge