Merge branch 'master' of ssh://git.planet-lab.org/git/monitor
authorStephen Soltesz <soltesz@cs.princeton.edu>
Fri, 23 Dec 2011 23:17:47 +0000 (23:17 +0000)
committerStephen Soltesz <soltesz@cs.princeton.edu>
Fri, 23 Dec 2011 23:17:47 +0000 (23:17 +0000)

Trivial merge