From: Martyn Smith <martyn@catalyst.net.nz>
Date: Thu, 12 Apr 2007 03:24:54 +0000 (+1200)
Subject: Merge branch 'master' of http://scorch.dollyfish.net.nz/~nigel/git/vserverctl
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a0969c6b3d484f16c1acf54cb21a0df11d162445;p=vserverctl.git

Merge branch 'master' of http://scorch.dollyfish.net.nz/~nigel/git/vserverctl
---

a0969c6b3d484f16c1acf54cb21a0df11d162445