Merge branch 'master' of ssh://git.onelab.eu/git/nodeconfig
Thierry Parmentelat [Wed, 3 Apr 2013 13:04:48 +0000 (15:04 +0200)]

Trivial merge