From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Tue, 27 Feb 2007 23:26:18 +0000 (+0000)
Subject: merge changes from HEAD
X-Git-Tag: planetlab-4_0-rc2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=214d8b3e75fd311ef412b0c5e8de20708f4d5125;p=mom.git

merge changes from HEAD
---

diff --git a/pl_mom.cron b/pl_mom.cron
index df3654d..1afab87 100644
--- a/pl_mom.cron
+++ b/pl_mom.cron
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id$
+# $Id: pl_mom.cron,v 1.5 2007/02/27 23:09:06 faiyaza Exp $
 #
 
 @M@	@H@	* *	*	root	/usr/local/planetlab/bin/pl_mop.sh
diff --git a/pl_mop.sh b/pl_mop.sh
index ad5faac..a14a2df 100755
--- a/pl_mop.sh
+++ b/pl_mop.sh
@@ -5,7 +5,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id$
+# $Id: pl_mop.sh,v 1.8 2007/02/14 20:48:46 faiyaza Exp $
 #
 
 PATH=/sbin:/usr/sbin:$PATH