Merge branch 'master' of ssh://git.planet-lab.org/git/monitor

diff --combined Monitor.spec
index f47a12c,01415ad..aa3b644
--- 1/Monitor.spec
--- 2/Monitor.spec
+++ b/Monitor.spec
@@@ -7,7 -7,7 +7,7 @@@
  %define name monitor
  # keep this version in sync with monitor/monitor_version.py
  %define version 3.1
- %define taglevel 2
+ %define taglevel 3
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  %global python_sitearch       %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@@ -243,10 -243,10 +243,10 @@@ rm -rf $RPM_BUILD_ROO
  /usr/share/%{name}/bootcd
  /usr/share/%{name}/commands
  /usr/share/%{name}/config.d
 -/usr/share/%{name}/cron.d
 +#/usr/share/%{name}/cron.d
  /usr/share/%{name}/docs
  /usr/share/%{name}/keys
 -/usr/share/%{name}/log
 +#/usr/share/%{name}/log
  /usr/share/%{name}/statistics
  /usr/share/%{name}/tests
  /usr/share/%{name}/tools
@@@ -354,6 -354,9 +354,9 @@@ f
  
  
  %changelog
+ * Fri May 27 2011 s s <soltesz@cs.princeton.edu> - monitor-3.1-3
+ - fixing syntax errors
+ 
  * Fri May 27 2011 s s <soltesz@cs.princeton.edu> - monitor-3.1-2
  - Add better requirements list, work with TurboGears packaged by fedora,
  - Remove some zabbix files