Merge branch 'master' of ssh://git.onelab.eu/git/sliceimage

diff --combined cron.d/sliceimage
index 0917331,b351ab3..b351ab3
--- 1/cron.d/sliceimage
--- 2/cron.d/vserver-reference
+++ b/cron.d/sliceimage
@@@ -5,7 -5,5 +5,5 @@@
  # Mark Huang <mlhuang@cs.princeton.edu>
  # Copyright (C) 2006 The Trustees of Princeton University
  #
- # $Id$
- #
  
  @M@ @H@ * * * root    /etc/init.d/vserver-reference start >/dev/null 2>&1

diff --combined initscripts/sliceimage
index 0785caa,aff0275..aff0275
--- 1/initscripts/sliceimage
--- 2/initscripts/vserver-reference
+++ b/initscripts/sliceimage
@@@ -9,8 -9,6 +9,6 @@@
  # Mark Huang <mlhuang@cs.princeton.edu>
  # Copyright (C) 2004 The Trustees of Princeton University
  #
- # $Id$
- #
  
  case "$1" in
      start|restart|reload)