Merge branch 'master' of ssh://git.planet-lab.org/git/monitor
Stephen Soltesz [Sat, 28 May 2011 00:10:11 +0000 (20:10 -0400)]
1  2 
Monitor.spec

diff --cc Monitor.spec
Simple merge