Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 20 Feb 2011 10:43:41 +0000 (11:43 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 20 Feb 2011 10:43:41 +0000 (11:43 +0100)

Trivial merge