Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 Mar 2011 08:21:40 +0000 (09:21 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 Mar 2011 08:21:40 +0000 (09:21 +0100)

Trivial merge