Merge branch '0.3' of ssh://git.planet-lab.org/git/util-vserver-pl into 0.3
authorAndy Bavier <acb@cs.princeton.edu>
Tue, 1 May 2012 15:29:43 +0000 (11:29 -0400)
committerAndy Bavier <acb@cs.princeton.edu>
Tue, 1 May 2012 15:29:43 +0000 (11:29 -0400)

Trivial merge