Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 16 Feb 2011 19:58:22 +0000 (20:58 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 16 Feb 2011 19:58:22 +0000 (20:58 +0100)

Trivial merge