merge changes from HEAD

diff --git a/bwmon.py b/bwmon.py
index 31eebd5..83b20e4 100644 (file)
--- a/bwmon.py
+++ b/bwmon.py
@@ -15,7 +15,7 @@
 # Faiyaz Ahmed <faiyaza@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id$
+# $Id: bwmon.py,v 1.10 2007/02/27 23:03:58 faiyaza Exp $
 #
 
 import os
@@ -400,11 +400,11 @@ def GetSlivers(data):
         (version, slices) = pickle.load(f)
         f.close()
         # Check version of data file
-        if version != "$Id$":
+        if version != "$Id: bwmon.py,v 1.10 2007/02/27 23:03:58 faiyaza Exp $":
             logger.log("bwmon:  Not using old version '%s' data file %s" % (version, datafile))
             raise Exception
     except Exception:
-        version = "$Id$"
+        version = "$Id: bwmon.py,v 1.10 2007/02/27 23:03:58 faiyaza Exp $"
         slices = {}
 
     # Get/set special slice IDs

diff --git a/setup.py b/setup.py
index 333bf63..2140950 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
+# $Id: setup.py,v 1.5 2007/02/12 23:00:31 faiyaza Exp $
 #
 
 from distutils.core import setup, Extension