Merge branch 'master' of ssh://git.planet-lab.org/git/vsys-scripts
Sapan Bhatia [Fri, 13 Jan 2012 22:36:48 +0000 (17:36 -0500)]

Trivial merge