Merge branch 'master' of ssh://sapanb@git.planet-lab.org/git/vsys-scripts
Sapan Bhatia [Fri, 15 Oct 2010 18:33:38 +0000 (14:33 -0400)]

Trivial merge