Merge branch 'master' of ssh://git.planet-lab.org/git/myops
Stephen Soltesz [Sun, 15 May 2011 03:24:17 +0000 (03:24 +0000)]

Trivial merge