Merge branch 'master' of ssh://git.planet-lab.org/git/vsys-scripts
Sapan Bhatia [Tue, 8 May 2012 19:22:33 +0000 (15:22 -0400)]

Trivial merge