Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 22 Nov 2010 12:15:37 +0000 (13:15 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 22 Nov 2010 12:15:37 +0000 (13:15 +0100)

Trivial merge