Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 26 Sep 2010 12:23:47 +0000 (14:23 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 26 Sep 2010 12:23:47 +0000 (14:23 +0200)

Trivial merge