Merge branch 'master' of ssh://git.onelab.eu/git/util-vserver
Thierry Parmentelat [Sun, 6 Nov 2011 14:41:24 +0000 (15:41 +0100)]

Trivial merge