diff --git a/Cantera/Makefile.in b/Cantera/Makefile.in
index 1d0500e66..8af85d494 100755
--- a/Cantera/Makefile.in
+++ b/Cantera/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2007/05/06 17:16:43 $
-#  $Revision: 1.8 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2001 California Institute of Technology
 #  See file License.txt for licensing information
diff --git a/Cantera/clib/src/Cabinet.h b/Cantera/clib/src/Cabinet.h
index 02ef05032..0369cbf72 100755
--- a/Cantera/clib/src/Cabinet.h
+++ b/Cantera/clib/src/Cabinet.h
@@ -2,7 +2,7 @@
  * @file Cabinet.h
  */
 /*
- *      $Id: Cabinet.h,v 1.9 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 
diff --git a/Cantera/clib/src/Makefile.in b/Cantera/clib/src/Makefile.in
index af4229a15..d42de7845 100755
--- a/Cantera/clib/src/Makefile.in
+++ b/Cantera/clib/src/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2008/12/30 21:49:41 $
-#  $Revision: 1.19 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2001 California Institute of Technology
 #
diff --git a/Cantera/clib/src/Storage.cpp b/Cantera/clib/src/Storage.cpp
index d5462bccb..fea7dc4ad 100755
--- a/Cantera/clib/src/Storage.cpp
+++ b/Cantera/clib/src/Storage.cpp
@@ -2,7 +2,7 @@
  * @file Storage.cpp
  */
 /*
- *      $Id: Storage.cpp,v 1.6 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 
diff --git a/Cantera/clib/src/Storage.h b/Cantera/clib/src/Storage.h
index 62db86fd5..159570e84 100755
--- a/Cantera/clib/src/Storage.h
+++ b/Cantera/clib/src/Storage.h
@@ -2,7 +2,7 @@
  * @file Storage.h
  */
 /*
- *      $Id: Storage.h,v 1.4 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #ifndef CTC_STORAGE_H
diff --git a/Cantera/clib/src/clib_defs.h b/Cantera/clib/src/clib_defs.h
index ba18a4811..f3fa601f7 100755
--- a/Cantera/clib/src/clib_defs.h
+++ b/Cantera/clib/src/clib_defs.h
@@ -2,7 +2,7 @@
  * @file clib_defs.h
  */
 /*
- *      $Id: clib_defs.h,v 1.5 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 
diff --git a/Cantera/clib/src/ct.cpp b/Cantera/clib/src/ct.cpp
index a0464f2bf..e6c33cbe8 100755
--- a/Cantera/clib/src/ct.cpp
+++ b/Cantera/clib/src/ct.cpp
@@ -8,7 +8,7 @@
  *   pointers are passed to or from the calling application.
  */
 
-/* $Id: ct.cpp,v 1.45 2009/07/22 01:23:40 hkmoffa Exp $  */
+/* $Id$  */
 
 // turn off warnings under Windows
 #ifdef WIN32
diff --git a/Cantera/clib/src/ct.h b/Cantera/clib/src/ct.h
index 4d91d4b05..8aa59bec3 100755
--- a/Cantera/clib/src/ct.h
+++ b/Cantera/clib/src/ct.h
@@ -2,7 +2,7 @@
  * @file ct.h
  */
 /*
- *      $Id: ct.h,v 1.24 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #ifndef CTC_CT_H
diff --git a/Cantera/clib/src/ctbdry.cpp b/Cantera/clib/src/ctbdry.cpp
index ca15f1c1b..76a4e188b 100755
--- a/Cantera/clib/src/ctbdry.cpp
+++ b/Cantera/clib/src/ctbdry.cpp
@@ -2,7 +2,7 @@
  * @file ctbdry.cpp
  */
 /*
- *      $Id: ctbdry.cpp,v 1.7 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 
diff --git a/Cantera/clib/src/ctbdry.h b/Cantera/clib/src/ctbdry.h
index be287776a..700901cf3 100755
--- a/Cantera/clib/src/ctbdry.h
+++ b/Cantera/clib/src/ctbdry.h
@@ -2,7 +2,7 @@
  * @file ctbdry.h
  */
 /*
- *      $Id: ctbdry.h,v 1.4 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #ifndef CTC_BDRY_H
diff --git a/Cantera/clib/src/ctfunc.cpp b/Cantera/clib/src/ctfunc.cpp
index 5f5aaede9..8e7fd442a 100755
--- a/Cantera/clib/src/ctfunc.cpp
+++ b/Cantera/clib/src/ctfunc.cpp
@@ -2,7 +2,7 @@
  * @file ctfunc.cpp
  */
 /*
- *      $Id: ctfunc.cpp,v 1.10 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #ifdef WIN32
diff --git a/Cantera/clib/src/ctfunc.h b/Cantera/clib/src/ctfunc.h
index 0b451ac19..8c60483ac 100755
--- a/Cantera/clib/src/ctfunc.h
+++ b/Cantera/clib/src/ctfunc.h
@@ -2,7 +2,7 @@
  * @file ctfunc.h
  */
 /*
- *      $Id: ctfunc.h,v 1.4 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #ifndef CTC_FUNC1_H
diff --git a/Cantera/clib/src/ctmultiphase.cpp b/Cantera/clib/src/ctmultiphase.cpp
index cf3692b62..e37c1dd5e 100644
--- a/Cantera/clib/src/ctmultiphase.cpp
+++ b/Cantera/clib/src/ctmultiphase.cpp
@@ -2,7 +2,7 @@
  * @file ctmultiphase.cpp
  */
 /*
- *      $Id: ctmultiphase.cpp,v 1.15 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 
diff --git a/Cantera/clib/src/ctmultiphase.h b/Cantera/clib/src/ctmultiphase.h
index ec3364e46..81c99c623 100644
--- a/Cantera/clib/src/ctmultiphase.h
+++ b/Cantera/clib/src/ctmultiphase.h
@@ -2,7 +2,7 @@
  * @file ctmultiphase.h
  */
 /*
- *      $Id: ctmultiphase.h,v 1.7 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #ifndef CTC_MULTIPHASE_H
diff --git a/Cantera/clib/src/ctnum.h b/Cantera/clib/src/ctnum.h
index 977c67a7b..791a302bf 100755
--- a/Cantera/clib/src/ctnum.h
+++ b/Cantera/clib/src/ctnum.h
@@ -2,7 +2,7 @@
  * @file ctnum.h
  */
 /*
- *      $Id: ctnum.h,v 1.2 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #ifndef CTC_CTNUM_H
diff --git a/Cantera/clib/src/ctonedim.cpp b/Cantera/clib/src/ctonedim.cpp
index b411fb85f..e1da6fa52 100644
--- a/Cantera/clib/src/ctonedim.cpp
+++ b/Cantera/clib/src/ctonedim.cpp
@@ -2,7 +2,7 @@
  * @file ctonedim.cpp
  */
 /*
- *      $Id: ctonedim.cpp,v 1.25 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 // turn off warnings under Windows
diff --git a/Cantera/clib/src/ctonedim.h b/Cantera/clib/src/ctonedim.h
index 1fa45c80e..8bf95e442 100644
--- a/Cantera/clib/src/ctonedim.h
+++ b/Cantera/clib/src/ctonedim.h
@@ -2,7 +2,7 @@
  * @file ctonedim.h
  */
 /*
- *      $Id: ctonedim.h,v 1.16 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #ifndef CTC_ONEDIM_H
diff --git a/Cantera/clib/src/ctreactor.cpp b/Cantera/clib/src/ctreactor.cpp
index 05d4976f7..0e8fff638 100755
--- a/Cantera/clib/src/ctreactor.cpp
+++ b/Cantera/clib/src/ctreactor.cpp
@@ -2,7 +2,7 @@
  * @file ctreactor.cpp
  */
 /*
- *      $Id: ctreactor.cpp,v 1.19 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 
diff --git a/Cantera/clib/src/ctreactor.h b/Cantera/clib/src/ctreactor.h
index a54ce3225..2ab223c07 100755
--- a/Cantera/clib/src/ctreactor.h
+++ b/Cantera/clib/src/ctreactor.h
@@ -2,7 +2,7 @@
  * @file ctreactor.h
  */
 /*
- *      $Id: ctreactor.h,v 1.7 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #ifndef CTC_REACTOR_H
diff --git a/Cantera/clib/src/ctrpath.cpp b/Cantera/clib/src/ctrpath.cpp
index 21cd23559..8de8aa1ef 100755
--- a/Cantera/clib/src/ctrpath.cpp
+++ b/Cantera/clib/src/ctrpath.cpp
@@ -2,7 +2,7 @@
  * @file ctrpath.cpp
  */
 /*
- *      $Id: ctrpath.cpp,v 1.4 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #define CANTERA_USE_INTERNAL
diff --git a/Cantera/clib/src/ctrpath.h b/Cantera/clib/src/ctrpath.h
index 5c51ca1e6..c2af32904 100755
--- a/Cantera/clib/src/ctrpath.h
+++ b/Cantera/clib/src/ctrpath.h
@@ -2,7 +2,7 @@
  * @file ctrpath.h
  */
 /*
- *      $Id: ctrpath.h,v 1.2 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #ifndef CTC_RXNPATH_H
diff --git a/Cantera/clib/src/ctstagn.h b/Cantera/clib/src/ctstagn.h
index 156f8732b..4b4b721bf 100755
--- a/Cantera/clib/src/ctstagn.h
+++ b/Cantera/clib/src/ctstagn.h
@@ -2,7 +2,7 @@
  * @file ctstagn.h
  */
 /*
- *      $Id: ctstagn.h,v 1.2 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #ifndef CTC_STAGN_H
diff --git a/Cantera/clib/src/ctsurf.cpp b/Cantera/clib/src/ctsurf.cpp
index 984c700b0..b7a5f9d93 100755
--- a/Cantera/clib/src/ctsurf.cpp
+++ b/Cantera/clib/src/ctsurf.cpp
@@ -2,7 +2,7 @@
  * @file ctsurf.cpp
  */
 /*
- *      $Id: ctsurf.cpp,v 1.6 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 // turn off warnings under Windows
diff --git a/Cantera/clib/src/ctsurf.h b/Cantera/clib/src/ctsurf.h
index 19cb35d6f..610422696 100755
--- a/Cantera/clib/src/ctsurf.h
+++ b/Cantera/clib/src/ctsurf.h
@@ -2,7 +2,7 @@
  * @file ctsurf.h
  */
 /*
- *      $Id: ctsurf.h,v 1.3 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #ifndef CTC_SURF_H
diff --git a/Cantera/clib/src/ctxml.cpp b/Cantera/clib/src/ctxml.cpp
index 5d008c9b0..57b237293 100644
--- a/Cantera/clib/src/ctxml.cpp
+++ b/Cantera/clib/src/ctxml.cpp
@@ -2,7 +2,7 @@
  * @file ctxml.cpp
  */
 /*
- *      $Id: ctxml.cpp,v 1.13 2009/07/22 01:21:35 hkmoffa Exp $
+ *      $Id$
  */
 
 
diff --git a/Cantera/clib/src/ctxml.h b/Cantera/clib/src/ctxml.h
index e3b67313d..7629c8465 100644
--- a/Cantera/clib/src/ctxml.h
+++ b/Cantera/clib/src/ctxml.h
@@ -2,7 +2,7 @@
  * @file ctxml.h
  */
 /*
- *      $Id: ctxml.h,v 1.6 2009/07/11 17:16:09 hkmoffa Exp $
+ *      $Id$
  */
 
 #ifndef CTC_XML_H
diff --git a/Cantera/cxx/Makefile.in b/Cantera/cxx/Makefile.in
index b142632e9..9bac968f9 100644
--- a/Cantera/cxx/Makefile.in
+++ b/Cantera/cxx/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2009/04/04 03:27:43 $
-#  $Revision: 1.14 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2001 California Institute of Technology
 #  See file License.txt for licensing information
diff --git a/Cantera/cxx/demos/kinetics1/kinetics1.cpp b/Cantera/cxx/demos/kinetics1/kinetics1.cpp
index e78d95096..b8e440838 100644
--- a/Cantera/cxx/demos/kinetics1/kinetics1.cpp
+++ b/Cantera/cxx/demos/kinetics1/kinetics1.cpp
@@ -2,9 +2,9 @@
 //
 //  zero-dimensional kinetics example program
 //
-//  $Author: hkmoffa $
-//  $Revision: 1.2 $
-//  $Date: 2009/05/13 21:52:29 $
+//  $Author$
+//  $Revision$
+//  $Date$
 //
 //  copyright California Institute of Technology 2002
 //
diff --git a/Cantera/cxx/include/Cantera.h b/Cantera/cxx/include/Cantera.h
index 15c32a444..0093fe998 100755
--- a/Cantera/cxx/include/Cantera.h
+++ b/Cantera/cxx/include/Cantera.h
@@ -5,8 +5,8 @@
  */
 
 /* 
- * $Revision: 1.11 $
- * $Date: 2009/01/05 23:34:40 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/cxx/include/Cantera.mak.in b/Cantera/cxx/include/Cantera.mak.in
index cb0cfec51..67b6b1885 100644
--- a/Cantera/cxx/include/Cantera.mak.in
+++ b/Cantera/cxx/include/Cantera.mak.in
@@ -15,7 +15,7 @@
 # 
 #
 #####################################################################
-# $Id: Cantera.mak.in,v 1.5 2009/01/09 23:26:41 hkmoffa Exp $
+# $Id$
 #
 #
 # This variable determines whether we are making this example in the
diff --git a/Cantera/cxx/include/Cantera_bt.mak.in b/Cantera/cxx/include/Cantera_bt.mak.in
index f9566f2bf..54c124c6e 100644
--- a/Cantera/cxx/include/Cantera_bt.mak.in
+++ b/Cantera/cxx/include/Cantera_bt.mak.in
@@ -15,7 +15,7 @@
 # 
 #
 #####################################################################
-# $Id: Cantera_bt.mak.in,v 1.2 2008/01/21 21:17:52 hkmoffa Exp $
+# $Id$
 #
 #
 # This variable determines whether we are making this example in the
diff --git a/Cantera/cxx/include/GRI30.h b/Cantera/cxx/include/GRI30.h
index 04de8f887..6bc28cb26 100644
--- a/Cantera/cxx/include/GRI30.h
+++ b/Cantera/cxx/include/GRI30.h
@@ -1,5 +1,5 @@
 /*
- * $Id: GRI30.h,v 1.8 2008/02/16 21:35:30 hkmoffa Exp $
+ * $Id$
  */
 #ifndef CXX_GRI30H
 #define CXX_GRI30H
diff --git a/Cantera/cxx/include/Interface.h b/Cantera/cxx/include/Interface.h
index 3dff74dac..0734fd233 100644
--- a/Cantera/cxx/include/Interface.h
+++ b/Cantera/cxx/include/Interface.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * $Id: Interface.h,v 1.10 2008/01/09 13:43:26 dggoodwin Exp $
+ * $Id$
  */
 
 #ifndef CXX_INTERFACE
diff --git a/Cantera/cxx/include/PureFluid.h b/Cantera/cxx/include/PureFluid.h
index 7b16fb675..ce7ec4c9e 100644
--- a/Cantera/cxx/include/PureFluid.h
+++ b/Cantera/cxx/include/PureFluid.h
@@ -1,5 +1,5 @@
 /*
- * $Id: PureFluid.h,v 1.7 2007/12/21 02:58:41 hkmoffa Exp $
+ * $Id$
  */
 #ifndef CXX_PUREFLUID
 #define CXX_PUREFLUID
diff --git a/Cantera/cxx/include/equilibrium.h b/Cantera/cxx/include/equilibrium.h
index 618495d48..1de354127 100755
--- a/Cantera/cxx/include/equilibrium.h
+++ b/Cantera/cxx/include/equilibrium.h
@@ -4,7 +4,7 @@
  *    (see \ref equilfunctions)
  */
 /*
- * $Id: equilibrium.h,v 1.11 2009/04/04 03:27:43 hkmoffa Exp $
+ * $Id$
  */
 #ifndef CT_EQUIL_INCL
 #define CT_EQUIL_INCL
diff --git a/Cantera/cxx/include/kinetics.h b/Cantera/cxx/include/kinetics.h
index 137599144..f19fd9114 100644
--- a/Cantera/cxx/include/kinetics.h
+++ b/Cantera/cxx/include/kinetics.h
@@ -1,5 +1,5 @@
 /*
- * $Id: kinetics.h,v 1.4 2007/05/04 15:18:41 dggoodwin Exp $
+ * $Id$
  */
 #ifndef CXX_INCL_KINETICS
 #define CXX_INCL_KINETICS
diff --git a/Cantera/cxx/include/zerodim.h b/Cantera/cxx/include/zerodim.h
index 34d932c4d..168039815 100644
--- a/Cantera/cxx/include/zerodim.h
+++ b/Cantera/cxx/include/zerodim.h
@@ -1,5 +1,5 @@
 /*
- * $Id: zerodim.h,v 1.8 2009/07/22 01:21:35 hkmoffa Exp $
+ * $Id$
  */
 #ifndef CT_INCL_ZERODIM_H
 #define CT_INCL_ZERODIM_H
diff --git a/Cantera/cxx/src/Makefile.in b/Cantera/cxx/src/Makefile.in
index 05eaa3c6e..01e78a4ac 100644
--- a/Cantera/cxx/src/Makefile.in
+++ b/Cantera/cxx/src/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2008/12/30 21:49:41 $
-#  $Revision: 1.17 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2001 California Institute of Technology
 #
diff --git a/Cantera/fortran/src/Makefile.in b/Cantera/fortran/src/Makefile.in
index 15f80f708..66f59382f 100644
--- a/Cantera/fortran/src/Makefile.in
+++ b/Cantera/fortran/src/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2009/04/04 03:23:32 $
-#  $Revision: 1.21 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2001 California Institute of Technology
 #
diff --git a/Cantera/fortran/src/fct.cpp b/Cantera/fortran/src/fct.cpp
index e7dcf99fd..7b746d9d6 100644
--- a/Cantera/fortran/src/fct.cpp
+++ b/Cantera/fortran/src/fct.cpp
@@ -7,7 +7,7 @@
  *   pointers are passed to or from the calling application.
  */
 /*
- * $Id: fct.cpp,v 1.14 2009/07/23 16:56:48 hkmoffa Exp $
+ * $Id$
  */
 
 // turn off warnings under Windows
diff --git a/Cantera/fortran/src/fctxml.cpp b/Cantera/fortran/src/fctxml.cpp
index 17c96f165..93efbc8a3 100644
--- a/Cantera/fortran/src/fctxml.cpp
+++ b/Cantera/fortran/src/fctxml.cpp
@@ -4,8 +4,8 @@
  */
 
 /*
- * $Revision: 1.9 $
- * $Date: 2009/07/23 17:03:04 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/matlab/Makefile.in b/Cantera/matlab/Makefile.in
index fa4000812..0bfbed956 100644
--- a/Cantera/matlab/Makefile.in
+++ b/Cantera/matlab/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2009/07/06 23:52:40 $
-#  $Revision: 1.33 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2001-2004 California Institute of Technology
 #  See file License.txt for licensing information
diff --git a/Cantera/matlab/cantera/Contents.m b/Cantera/matlab/cantera/Contents.m
index c5a94f3e5..5a4f155ec 100755
--- a/Cantera/matlab/cantera/Contents.m
+++ b/Cantera/matlab/cantera/Contents.m
@@ -33,7 +33,7 @@
 %   ctclear     - Clear all objects from memory.
 %
 %   Copyright 2002 California Institute of Technology
-%   $Revision: 1.1.1.1 $  $Date: 2003/04/14 17:57:49 $
+%   $Revision$  $Date$
 
 
 
diff --git a/Cantera/matlab/cantera/private/ctfunctions.cpp b/Cantera/matlab/cantera/private/ctfunctions.cpp
index 49c4edcad..f6b937e22 100644
--- a/Cantera/matlab/cantera/private/ctfunctions.cpp
+++ b/Cantera/matlab/cantera/private/ctfunctions.cpp
@@ -2,7 +2,7 @@
  *   @file ctfunctions.cpp
  */
 /*
- *  $Id: ctfunctions.cpp,v 1.10 2009/07/11 16:43:12 hkmoffa Exp $
+ *  $Id$
  */
 
 #include "mex.h"
diff --git a/Cantera/matlab/cantera/private/mixturemethods.cpp b/Cantera/matlab/cantera/private/mixturemethods.cpp
index 671c8d901..fc0018012 100644
--- a/Cantera/matlab/cantera/private/mixturemethods.cpp
+++ b/Cantera/matlab/cantera/private/mixturemethods.cpp
@@ -2,7 +2,7 @@
  * @file mixturemethods.cpp
  */
 /*
- *    $Id: mixturemethods.cpp,v 1.3 2009/07/11 16:43:12 hkmoffa Exp $
+ *    $Id$
  */
 #include "mex.h"
 #include "../../../clib/src/ctmultiphase.h"
diff --git a/Cantera/matlab/cantera/private/mllogger.h b/Cantera/matlab/cantera/private/mllogger.h
index 2c4ac8d96..30d0e2dd3 100644
--- a/Cantera/matlab/cantera/private/mllogger.h
+++ b/Cantera/matlab/cantera/private/mllogger.h
@@ -2,7 +2,7 @@
  * @file mlloger.h
  */
 /*
- * $Id: mllogger.h,v 1.5 2009/07/11 16:43:12 hkmoffa Exp $
+ * $Id$
  */
 
 #ifndef MLLOGGER_H
diff --git a/Cantera/matlab/cantera/private/phasemethods.cpp b/Cantera/matlab/cantera/private/phasemethods.cpp
index df75fa57e..3a958f1df 100644
--- a/Cantera/matlab/cantera/private/phasemethods.cpp
+++ b/Cantera/matlab/cantera/private/phasemethods.cpp
@@ -2,7 +2,7 @@
  *  @file phasemethods.cpp
  */
 /*
- *  $Id: phasemethods.cpp,v 1.5 2009/07/11 16:43:12 hkmoffa Exp $
+ *  $Id$
  */
 
 #include "mex.h"
diff --git a/Cantera/matlab/cantera/private/reactormethods.cpp b/Cantera/matlab/cantera/private/reactormethods.cpp
index b22cf37fb..49bad594c 100644
--- a/Cantera/matlab/cantera/private/reactormethods.cpp
+++ b/Cantera/matlab/cantera/private/reactormethods.cpp
@@ -2,7 +2,7 @@
  * @file reactormethods.cpp
  */
 /*
- *  $Id: reactormethods.cpp,v 1.5 2009/07/11 16:43:12 hkmoffa Exp $
+ *  $Id$
  */
 
 #include "mex.h"
diff --git a/Cantera/matlab/cantera/private/reactornetmethods.cpp b/Cantera/matlab/cantera/private/reactornetmethods.cpp
index 27b678809..766ae885f 100644
--- a/Cantera/matlab/cantera/private/reactornetmethods.cpp
+++ b/Cantera/matlab/cantera/private/reactornetmethods.cpp
@@ -2,7 +2,7 @@
  * @file reactornetmethods.cpp
  */
 /*
- *   $Id: reactornetmethods.cpp,v 1.4 2009/07/11 16:43:13 hkmoffa Exp $
+ *   $Id$
  */
 
 #include "mex.h"
diff --git a/Cantera/matlab/cantera/private/thermomethods.cpp b/Cantera/matlab/cantera/private/thermomethods.cpp
index c2fb43512..02286ed88 100644
--- a/Cantera/matlab/cantera/private/thermomethods.cpp
+++ b/Cantera/matlab/cantera/private/thermomethods.cpp
@@ -2,7 +2,7 @@
  *  @file thermomethods.cpp
  */
 /*
- * $Id: thermomethods.cpp,v 1.11 2009/07/11 16:43:13 hkmoffa Exp $
+ * $Id$
  */
 #include "mex.h"
 #include "../../../clib/src/ct.h"
diff --git a/Cantera/matlab/cantera/private/wallmethods.cpp b/Cantera/matlab/cantera/private/wallmethods.cpp
index 004b4c652..1b7cf7e20 100644
--- a/Cantera/matlab/cantera/private/wallmethods.cpp
+++ b/Cantera/matlab/cantera/private/wallmethods.cpp
@@ -2,7 +2,7 @@
  *  @file wallmethods.cpp
  */
 /*
- *   $Id: wallmethods.cpp,v 1.5 2009/07/11 16:43:13 hkmoffa Exp $
+ *   $Id$
  */
 #include "mex.h"
 #include "../../../clib/src/ctreactor.h"
diff --git a/Cantera/matlab/cantera/private/xmlmethods.cpp b/Cantera/matlab/cantera/private/xmlmethods.cpp
index 5cc4ed959..00397e429 100644
--- a/Cantera/matlab/cantera/private/xmlmethods.cpp
+++ b/Cantera/matlab/cantera/private/xmlmethods.cpp
@@ -2,7 +2,7 @@
  *  @file xmlmethods.cpp
  */
 /*
- *  $Id: xmlmethods.cpp,v 1.5 2009/07/11 16:43:13 hkmoffa Exp $
+ *  $Id$
  */
 
 #include "mex.h"
diff --git a/Cantera/matlab/setup_winmatlab.py b/Cantera/matlab/setup_winmatlab.py
index 6207f9815..c41132377 100644
--- a/Cantera/matlab/setup_winmatlab.py
+++ b/Cantera/matlab/setup_winmatlab.py
@@ -1,7 +1,7 @@
 #
 # python script to create a few key files for the windows build
 #
-# $Id: setup_winmatlab.py,v 1.29 2009/07/20 19:38:53 hkmoffa Exp $
+# $Id$
 #
 import sys
 import os
diff --git a/Cantera/python/Cantera/Edge.py b/Cantera/python/Cantera/Edge.py
index 32a8c512f..a6c661186 100644
--- a/Cantera/python/Cantera/Edge.py
+++ b/Cantera/python/Cantera/Edge.py
@@ -7,7 +7,7 @@ from SurfacePhase import EdgePhase
 from Kinetics import Kinetics
 import XML
 
-__revision__ = "$Id: Edge.py,v 1.1 2006/04/23 07:27:10 dggoodwin Exp $"
+__revision__ = "$Id$"
 
 class Edge(EdgePhase, Kinetics):    
     """
diff --git a/Cantera/python/Cantera/Interface.py b/Cantera/python/Cantera/Interface.py
index 7a7307966..8a26d8f61 100644
--- a/Cantera/python/Cantera/Interface.py
+++ b/Cantera/python/Cantera/Interface.py
@@ -7,7 +7,7 @@ from SurfacePhase import SurfacePhase, EdgePhase
 from Kinetics import Kinetics
 import XML
 
-__revision__ = "$Id: Interface.py,v 1.8 2007/02/17 10:48:09 dggoodwin Exp $"
+__revision__ = "$Id$"
 
 class Interface(SurfacePhase, Kinetics):    
     """
diff --git a/Cantera/python/Cantera/Phase.py b/Cantera/python/Cantera/Phase.py
index c5cc1fdba..ed65174e8 100755
--- a/Cantera/python/Cantera/Phase.py
+++ b/Cantera/python/Cantera/Phase.py
@@ -10,7 +10,7 @@ import types
 from Cantera.num import asarray
 from exceptions import CanteraError
 
-__revision__ = "$Id: Phase.py,v 1.9 2007/05/25 14:17:38 dggoodwin Exp $"
+__revision__ = "$Id$"
 
 # return true is x is a sequence
 def _isseq(n, x):
diff --git a/Cantera/python/Cantera/importFromFile.py b/Cantera/python/Cantera/importFromFile.py
index 448d13074..4d9f3ae5f 100755
--- a/Cantera/python/Cantera/importFromFile.py
+++ b/Cantera/python/Cantera/importFromFile.py
@@ -8,7 +8,7 @@ import Interface
 import Edge
 import XML
 
-__revision__ = "$Id: importFromFile.py,v 1.12 2007/02/17 10:48:09 dggoodwin Exp $"
+__revision__ = "$Id$"
 
 def importPhase(file, name = '', loglevel = 0, debug = 0):
     """Import one phase from an input  file.  If 'name' is specified, the
diff --git a/Cantera/python/Makefile.in b/Cantera/python/Makefile.in
index f4f268608..9d83154b3 100755
--- a/Cantera/python/Makefile.in
+++ b/Cantera/python/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2009/04/19 21:11:51 $
-#  $Revision: 1.31 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2001 California Institute of Technology
 #  See file License.txt for licensing information
diff --git a/Cantera/python/ctml_writer.py b/Cantera/python/ctml_writer.py
index 1d78f79cd..9754a7d53 100644
--- a/Cantera/python/ctml_writer.py
+++ b/Cantera/python/ctml_writer.py
@@ -16,7 +16,7 @@
 #
 #
 
-#  $Id: ctml_writer.py,v 1.25 2007/12/30 04:19:38 dggoodwin Exp $
+#  $Id$
 
 import string
 
diff --git a/Cantera/python/src/Makefile.in b/Cantera/python/src/Makefile.in
index 4791f646d..2a68ff12f 100755
--- a/Cantera/python/src/Makefile.in
+++ b/Cantera/python/src/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: dggoodwin $
-#  $Date: 2003/04/14 17:57:50 $
-#  $Revision: 1.1.1.1 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2001 California Institute of Technology
 #
diff --git a/Cantera/python/src/ctkinetics_methods.cpp b/Cantera/python/src/ctkinetics_methods.cpp
index 45cd77c19..a9309a4b0 100644
--- a/Cantera/python/src/ctkinetics_methods.cpp
+++ b/Cantera/python/src/ctkinetics_methods.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * $Id: ctkinetics_methods.cpp,v 1.8 2009/04/19 21:03:10 hkmoffa Exp $
+ * $Id$
  */
 
 
diff --git a/Cantera/python/src/ctonedim_methods.cpp b/Cantera/python/src/ctonedim_methods.cpp
index 397419f1d..d1ac71e89 100644
--- a/Cantera/python/src/ctonedim_methods.cpp
+++ b/Cantera/python/src/ctonedim_methods.cpp
@@ -1,6 +1,6 @@
 
 /*
- *   $Id: ctonedim_methods.cpp,v 1.12 2009/03/24 19:13:02 hkmoffa Exp $
+ *   $Id$
  */
 
 
diff --git a/Cantera/src/Makefile.in b/Cantera/src/Makefile.in
index 4408231f2..01072f159 100755
--- a/Cantera/src/Makefile.in
+++ b/Cantera/src/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: dggoodwin $
-#  $Date: 2007/12/15 17:15:50 $
-#  $Revision: 1.58 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2001 California Institute of Technology
 #
diff --git a/Cantera/src/base/Array.h b/Cantera/src/base/Array.h
index 003700a8c..22c508748 100755
--- a/Cantera/src/base/Array.h
+++ b/Cantera/src/base/Array.h
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Revision: 1.5 $
- *  $Date: 2009/01/15 23:05:34 $
+ *  $Author$
+ *  $Revision$
+ *  $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/base/LogPrintCtrl.cpp b/Cantera/src/base/LogPrintCtrl.cpp
index fac746ece..34cef0ba6 100644
--- a/Cantera/src/base/LogPrintCtrl.cpp
+++ b/Cantera/src/base/LogPrintCtrl.cpp
@@ -4,9 +4,9 @@
  *   (see \ref Cantera::LogPrintCtrl).
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2008/04/08 20:19:26 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/base/LogPrintCtrl.h b/Cantera/src/base/LogPrintCtrl.h
index 80aa5a8bf..889298e2b 100644
--- a/Cantera/src/base/LogPrintCtrl.h
+++ b/Cantera/src/base/LogPrintCtrl.h
@@ -4,8 +4,8 @@
  *   (see \ref Cantera::LogPrintCtrl).
  */
 /*
- * $Revision: 1.2 $
- * $Date: 2009/01/15 20:08:50 $
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/base/Makefile.in b/Cantera/src/base/Makefile.in
index 73c81a191..7d00cb58a 100644
--- a/Cantera/src/base/Makefile.in
+++ b/Cantera/src/base/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2009/02/11 19:55:56 $
-#  $Revision: 1.8 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2002 California Institute of Technology
 #
diff --git a/Cantera/src/base/PrintCtrl.cpp b/Cantera/src/base/PrintCtrl.cpp
index f40824fb4..973b248b2 100644
--- a/Cantera/src/base/PrintCtrl.cpp
+++ b/Cantera/src/base/PrintCtrl.cpp
@@ -4,9 +4,9 @@
  *   (see \ref Cantera::PrintCtrl).
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.3 $
- * $Date: 2009/03/14 00:27:10 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/base/PrintCtrl.h b/Cantera/src/base/PrintCtrl.h
index 50e224bc5..cce65457f 100644
--- a/Cantera/src/base/PrintCtrl.h
+++ b/Cantera/src/base/PrintCtrl.h
@@ -4,8 +4,8 @@
  *   (see \ref Cantera::PrintCtrl).
  */
 /*
- * $Revision: 1.3 $
- * $Date: 2009/03/14 00:27:10 $
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/base/checkFinite.cpp b/Cantera/src/base/checkFinite.cpp
index f4f2f2601..b20096b99 100644
--- a/Cantera/src/base/checkFinite.cpp
+++ b/Cantera/src/base/checkFinite.cpp
@@ -4,8 +4,8 @@
  *   check for the presence of NaNs in the code.
  */
 /*
- * $Revision: 1.2 $
- * $Date: 2009/03/27 00:39:43 $
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/base/clockWC.cpp b/Cantera/src/base/clockWC.cpp
index 6c823ca7d..7b7bd7936 100644
--- a/Cantera/src/base/clockWC.cpp
+++ b/Cantera/src/base/clockWC.cpp
@@ -4,9 +4,9 @@
  *     (see \ref Cantera::clockWC).
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2007/06/11 15:20:03 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/base/clockWC.h b/Cantera/src/base/clockWC.h
index d9888ed99..8d3ad1654 100644
--- a/Cantera/src/base/clockWC.h
+++ b/Cantera/src/base/clockWC.h
@@ -4,9 +4,9 @@
  *   (see \ref Cantera::clockWC).
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2007/06/11 15:20:03 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/base/ct2ctml.cpp b/Cantera/src/base/ct2ctml.cpp
index da2fb958b..591d599fb 100644
--- a/Cantera/src/base/ct2ctml.cpp
+++ b/Cantera/src/base/ct2ctml.cpp
@@ -5,8 +5,8 @@
  */
 
 /*
- * $Revision: 1.14 $
- * $Date: 2009/07/13 16:47:40 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001-2005  California Institute of Technology
diff --git a/Cantera/src/base/ct_defs.h b/Cantera/src/base/ct_defs.h
index 3b8cb52db..c394cadb7 100755
--- a/Cantera/src/base/ct_defs.h
+++ b/Cantera/src/base/ct_defs.h
@@ -10,8 +10,8 @@
  */
 
 /*
- * $Revision: 1.9 $
- * $Date: 2009/01/24 00:15:00 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/base/ctexceptions.h b/Cantera/src/base/ctexceptions.h
index 80b787814..1c29cbd36 100755
--- a/Cantera/src/base/ctexceptions.h
+++ b/Cantera/src/base/ctexceptions.h
@@ -6,8 +6,8 @@
  */
 
 /*
- *  $Date: 2009/02/11 19:55:57 $
- *  $Revision: 1.7 $
+ *  $Date$
+ *  $Revision$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/base/ctml.cpp b/Cantera/src/base/ctml.cpp
index b705927c0..9e0cf934b 100755
--- a/Cantera/src/base/ctml.cpp
+++ b/Cantera/src/base/ctml.cpp
@@ -5,8 +5,8 @@
  */
 
 /*
- * $Revision: 1.24 $
- * $Date: 2009/03/13 03:18:08 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2002  California Institute of Technology
diff --git a/Cantera/src/base/ctml.h b/Cantera/src/base/ctml.h
index 25fbe3a9c..5cfe45417 100755
--- a/Cantera/src/base/ctml.h
+++ b/Cantera/src/base/ctml.h
@@ -6,8 +6,8 @@
  */
 
 /* 
- * $Revision: 1.22 $
- * $Date: 2009/07/11 17:20:19 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2002  California Institute of Technology
diff --git a/Cantera/src/base/global.h b/Cantera/src/base/global.h
index d3b02c924..c0386d8fc 100755
--- a/Cantera/src/base/global.h
+++ b/Cantera/src/base/global.h
@@ -17,8 +17,8 @@
  */
 
 /* 
- * $Revision: 1.8 $
- * $Date: 2009/07/06 23:52:40 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/base/logger.h b/Cantera/src/base/logger.h
index fcc93b0ca..d4b508aa3 100644
--- a/Cantera/src/base/logger.h
+++ b/Cantera/src/base/logger.h
@@ -4,7 +4,7 @@
  * (see \ref textlogs and class \link Cantera::Logger Logger\endlink).
  */
 /*
- * $Id: logger.h,v 1.3 2008/12/17 17:13:35 hkmoffa Exp $
+ * $Id$
  */
 
 #ifndef CT_LOGGER_H
diff --git a/Cantera/src/base/mdp_allo.cpp b/Cantera/src/base/mdp_allo.cpp
index 745601491..1d9f90e3f 100644
--- a/Cantera/src/base/mdp_allo.cpp
+++ b/Cantera/src/base/mdp_allo.cpp
@@ -3,8 +3,8 @@
  *   Definitions for dynamic allocation of multidimensional pointer arrays
  */
 /*
- * $Revision: 1.3 $
- * $Date: 2009/07/22 01:21:35 $
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/base/mdp_allo.h b/Cantera/src/base/mdp_allo.h
index 03c969fef..ef41f9b95 100644
--- a/Cantera/src/base/mdp_allo.h
+++ b/Cantera/src/base/mdp_allo.h
@@ -5,8 +5,8 @@
  *   one call.
  */
 /*
- * $Revision: 1.2 $
- * $Date: 2009/03/27 00:39:43 $
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/base/misc.cpp b/Cantera/src/base/misc.cpp
index f0a9d8e8e..30d8d9a90 100755
--- a/Cantera/src/base/misc.cpp
+++ b/Cantera/src/base/misc.cpp
@@ -10,7 +10,7 @@
  *      HTML_logs
  */
 /*
- *  $Id: misc.cpp,v 1.16 2009/07/13 16:47:40 hkmoffa Exp $
+ *  $Id$
  */
 
 #ifdef WIN32
diff --git a/Cantera/src/base/plots.cpp b/Cantera/src/base/plots.cpp
index de293ba48..fe093e030 100755
--- a/Cantera/src/base/plots.cpp
+++ b/Cantera/src/base/plots.cpp
@@ -3,8 +3,8 @@
  */
 
 /*
- * $Revision: 1.2 $
- * $Date: 2009/01/14 23:16:24 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2002  California Institute of Technology
diff --git a/Cantera/src/base/plots.h b/Cantera/src/base/plots.h
index 794680d37..5c2a0a186 100755
--- a/Cantera/src/base/plots.h
+++ b/Cantera/src/base/plots.h
@@ -5,8 +5,8 @@
  */
 
 /*
- * $Revision: 1.2 $
- * $Date: 2009/01/14 23:16:24 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/base/stringUtils.cpp b/Cantera/src/base/stringUtils.cpp
index a8f61444a..54eb66d32 100755
--- a/Cantera/src/base/stringUtils.cpp
+++ b/Cantera/src/base/stringUtils.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * $Id: stringUtils.cpp,v 1.22 2009/01/15 20:08:50 hkmoffa Exp $
+ * $Id$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/base/stringUtils.h b/Cantera/src/base/stringUtils.h
index 367affb23..4dc6c7dbf 100755
--- a/Cantera/src/base/stringUtils.h
+++ b/Cantera/src/base/stringUtils.h
@@ -5,8 +5,8 @@
  */
 
 /*
- * $Revision: 1.15 $
- * $Date: 2009/01/15 20:08:50 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/base/units.h b/Cantera/src/base/units.h
index 81be47535..6e3ac70a5 100644
--- a/Cantera/src/base/units.h
+++ b/Cantera/src/base/units.h
@@ -7,7 +7,7 @@
  * This header is included only by file misc.cpp.
  */
 /*
- * $Id: units.h,v 1.5 2007/12/15 17:15:50 dggoodwin Exp $
+ * $Id$
  */
 //    Copyright 2002 California Institute of Technology
 
diff --git a/Cantera/src/base/utilities.h b/Cantera/src/base/utilities.h
index a608789f5..7b5221555 100755
--- a/Cantera/src/base/utilities.h
+++ b/Cantera/src/base/utilities.h
@@ -6,7 +6,7 @@
 
 // Copyright 2001  California Institute of Technology
 /*
- * $Id: utilities.h,v 1.9 2008/08/22 14:41:07 hkmoffa Exp $
+ * $Id$
 
  */
 /**
diff --git a/Cantera/src/base/vec_functions.h b/Cantera/src/base/vec_functions.h
index 3b74ca33c..c3b14fff1 100755
--- a/Cantera/src/base/vec_functions.h
+++ b/Cantera/src/base/vec_functions.h
@@ -3,8 +3,8 @@
  *  Templates for operations on vector-like objects. 
  */
 /*
- *  $Date: 2009/01/15 20:08:50 $
- *  $Revision: 1.3 $
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001 California Institute of Technology
  *
diff --git a/Cantera/src/base/xml.cpp b/Cantera/src/base/xml.cpp
index ad52226e8..d4c6f0e80 100755
--- a/Cantera/src/base/xml.cpp
+++ b/Cantera/src/base/xml.cpp
@@ -6,8 +6,8 @@
  */
 
 /*
- * $Revision: 1.27 $
- * $Date: 2009/07/22 01:21:35 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/base/xml.h b/Cantera/src/base/xml.h
index 392da867d..b66567446 100755
--- a/Cantera/src/base/xml.h
+++ b/Cantera/src/base/xml.h
@@ -6,8 +6,8 @@
  */
 
 /* 
- * $Revision: 1.23 $
- * $Date: 2009/07/22 01:21:35 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/converters/CKParser.cpp b/Cantera/src/converters/CKParser.cpp
index 3efea5455..b51b408ea 100755
--- a/Cantera/src/converters/CKParser.cpp
+++ b/Cantera/src/converters/CKParser.cpp
@@ -5,7 +5,7 @@
 
 // Copyright 2001  California Institute of Technology
 //
-// $Id: CKParser.cpp,v 1.23 2009/03/13 03:26:18 hkmoffa Exp $
+// $Id$
 
 // turn off warnings about truncating long names under Windows
 #ifdef WIN32
diff --git a/Cantera/src/converters/Makefile.in b/Cantera/src/converters/Makefile.in
index 9290b1ad7..d491f2f59 100644
--- a/Cantera/src/converters/Makefile.in
+++ b/Cantera/src/converters/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2008/12/30 21:49:41 $
-#  $Revision: 1.19 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2002 California Institute of Technology
 #
diff --git a/Cantera/src/converters/NASA9Parser.cpp b/Cantera/src/converters/NASA9Parser.cpp
index 8b917c78d..cb4f7069a 100644
--- a/Cantera/src/converters/NASA9Parser.cpp
+++ b/Cantera/src/converters/NASA9Parser.cpp
@@ -5,7 +5,7 @@
 
 // Copyright 2001  California Institute of Technology
 //
-// $Id: NASA9Parser.cpp,v 1.2 2009/03/13 03:26:18 hkmoffa Exp $
+// $Id$
 //
 
 
diff --git a/Cantera/src/converters/Species.h b/Cantera/src/converters/Species.h
index 9b0b84e99..9b82c7d3a 100755
--- a/Cantera/src/converters/Species.h
+++ b/Cantera/src/converters/Species.h
@@ -3,7 +3,7 @@
  *
  */
 /*
- * $Id: Species.h,v 1.2 2007/09/13 15:05:39 hkmoffa Exp $
+ * $Id$
  */
 // Copyright 2001  California Institute of Technology
 
diff --git a/Cantera/src/converters/ck2ct.cpp b/Cantera/src/converters/ck2ct.cpp
index a9b178586..464ab8283 100644
--- a/Cantera/src/converters/ck2ct.cpp
+++ b/Cantera/src/converters/ck2ct.cpp
@@ -3,7 +3,7 @@
  *   Convert CK-format reaction mechanism files to Cantera input format.
  */
 /*
- * $Id: ck2ct.cpp,v 1.27 2009/01/10 18:03:31 hkmoffa Exp $
+ * $Id$
  *
  */
 #ifdef WIN32
diff --git a/Cantera/src/equil/BasisOptimize.cpp b/Cantera/src/equil/BasisOptimize.cpp
index 809cd2050..b98d36ff4 100644
--- a/Cantera/src/equil/BasisOptimize.cpp
+++ b/Cantera/src/equil/BasisOptimize.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * $Id: BasisOptimize.cpp,v 1.9 2009/01/05 23:20:43 hkmoffa Exp $
+ * $Id$
  */
 
 #include "ct_defs.h"
diff --git a/Cantera/src/equil/ChemEquil.cpp b/Cantera/src/equil/ChemEquil.cpp
index 25b3145ab..d78714575 100755
--- a/Cantera/src/equil/ChemEquil.cpp
+++ b/Cantera/src/equil/ChemEquil.cpp
@@ -8,7 +8,7 @@
  /*
  *
  *
- *  $Id: ChemEquil.cpp,v 1.15 2009/03/14 03:28:04 hkmoffa Exp $
+ *  $Id$
  *
  *  Copyright 2001 California Institute of Technology
  *
diff --git a/Cantera/src/equil/ChemEquil.h b/Cantera/src/equil/ChemEquil.h
index d40d1ef77..f39244292 100755
--- a/Cantera/src/equil/ChemEquil.h
+++ b/Cantera/src/equil/ChemEquil.h
@@ -3,9 +3,9 @@
  *
  *  Chemical equilibrium.
  *
- *  $Author: hkmoffa $
- *  $Date: 2008/09/04 17:03:42 $
- *  $Revision: 1.6 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001 California Institute of Technology
  *
diff --git a/Cantera/src/equil/Makefile.in b/Cantera/src/equil/Makefile.in
index 1ef465f86..363c44348 100644
--- a/Cantera/src/equil/Makefile.in
+++ b/Cantera/src/equil/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2008/12/30 21:49:41 $
-#  $Revision: 1.16 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2002 California Institute of Technology
 #
diff --git a/Cantera/src/equil/MultiPhase.cpp b/Cantera/src/equil/MultiPhase.cpp
index 7d8567f72..81dcb4865 100644
--- a/Cantera/src/equil/MultiPhase.cpp
+++ b/Cantera/src/equil/MultiPhase.cpp
@@ -5,8 +5,8 @@
  */
 /*
  *
- *  $Date: 2009/04/17 00:40:48 $
- *  $Revision: 1.15 $
+ *  $Date$
+ *  $Revision$
  */
 
 #include "MultiPhase.h"
diff --git a/Cantera/src/equil/MultiPhase.h b/Cantera/src/equil/MultiPhase.h
index 7dfa0a5a3..fa96148c3 100644
--- a/Cantera/src/equil/MultiPhase.h
+++ b/Cantera/src/equil/MultiPhase.h
@@ -5,8 +5,8 @@
  */
 
 /*
- *  $Date: 2009/04/17 00:40:48 $
- *  $Revision: 1.11 $
+ *  $Date$
+ *  $Revision$
  */
 
 //  Copyright 2004  California Institute of Technology
diff --git a/Cantera/src/equil/MultiPhaseEquil.cpp b/Cantera/src/equil/MultiPhaseEquil.cpp
index db5e786d4..0d70eaae5 100644
--- a/Cantera/src/equil/MultiPhaseEquil.cpp
+++ b/Cantera/src/equil/MultiPhaseEquil.cpp
@@ -2,7 +2,7 @@
  * @file MultiPhaseEquil.cpp
  */
 /*
- * $Id: MultiPhaseEquil.cpp,v 1.12 2009/04/22 00:33:35 hkmoffa Exp $
+ * $Id$
  */
 
 #include "MultiPhaseEquil.h"
diff --git a/Cantera/src/equil/PropertyCalculator.h b/Cantera/src/equil/PropertyCalculator.h
index f5ae87345..cb37cbcbb 100755
--- a/Cantera/src/equil/PropertyCalculator.h
+++ b/Cantera/src/equil/PropertyCalculator.h
@@ -1,9 +1,9 @@
 /**
  *  @file PropertyCalculator.h 
  *
- * $Author: hkmoffa $
- * $Revision: 1.2 $
- * $Date: 2008/12/17 16:56:43 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/equil/equil.h b/Cantera/src/equil/equil.h
index e43f1471a..937b70a4a 100644
--- a/Cantera/src/equil/equil.h
+++ b/Cantera/src/equil/equil.h
@@ -1,8 +1,8 @@
 /***********************************************************************
  *  $RCSfile: equil.h,v $
- *  $Author: hkmoffa $
- *  $Date: 2008/04/11 22:44:49 $
- *  $Revision: 1.3 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  ***********************************************************************/
 //  Copyright 2001  California Institute of Technology
 
diff --git a/Cantera/src/equil/equilibrate.cpp b/Cantera/src/equil/equilibrate.cpp
index 3c50e5cca..548df4f68 100644
--- a/Cantera/src/equil/equilibrate.cpp
+++ b/Cantera/src/equil/equilibrate.cpp
@@ -4,7 +4,7 @@
  *
  */
 /*
- * $Id: equilibrate.cpp,v 1.11 2009/03/18 17:27:20 hkmoffa Exp $
+ * $Id$
  */
 #include "equil.h"
 #include "ChemEquil.h"
diff --git a/Cantera/src/equil/vcs_DoubleStarStar.cpp b/Cantera/src/equil/vcs_DoubleStarStar.cpp
index 0b72701eb..4a95e111b 100644
--- a/Cantera/src/equil/vcs_DoubleStarStar.cpp
+++ b/Cantera/src/equil/vcs_DoubleStarStar.cpp
@@ -5,9 +5,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Revision: 1.2 $
- *  $Date: 2008/08/01 16:05:38 $
+ *  $Author$
+ *  $Revision$
+ *  $Date$
  */
 
 #include "vcs_DoubleStarStar.h"
diff --git a/Cantera/src/equil/vcs_DoubleStarStar.h b/Cantera/src/equil/vcs_DoubleStarStar.h
index cb6060f69..79db395ea 100644
--- a/Cantera/src/equil/vcs_DoubleStarStar.h
+++ b/Cantera/src/equil/vcs_DoubleStarStar.h
@@ -5,9 +5,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Revision: 1.2 $
- *  $Date: 2008/08/01 16:05:38 $
+ *  $Author$
+ *  $Revision$
+ *  $Date$
  */
 
 #ifndef VCS_DOUBLESTARSTAR_H
diff --git a/Cantera/src/equil/vcs_Exception.h b/Cantera/src/equil/vcs_Exception.h
index 3ee7fbacb..c08216868 100644
--- a/Cantera/src/equil/vcs_Exception.h
+++ b/Cantera/src/equil/vcs_Exception.h
@@ -2,7 +2,7 @@
  * @file vcs_Exception.h
  */
 /*
- * $Id: vcs_Exception.h,v 1.2 2008/07/22 16:23:55 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/equil/vcs_Gibbs.cpp b/Cantera/src/equil/vcs_Gibbs.cpp
index 224095eae..f427da1a3 100644
--- a/Cantera/src/equil/vcs_Gibbs.cpp
+++ b/Cantera/src/equil/vcs_Gibbs.cpp
@@ -3,7 +3,7 @@
  *   Functions which calculate the extrinsic Gibbs Free energies
  */
 /*
- * $Id: vcs_Gibbs.cpp,v 1.12 2009/03/27 21:32:33 hkmoffa Exp $
+ * $Id$
  */
 
 /*
diff --git a/Cantera/src/equil/vcs_IntStarStar.cpp b/Cantera/src/equil/vcs_IntStarStar.cpp
index c356298f0..772ade325 100644
--- a/Cantera/src/equil/vcs_IntStarStar.cpp
+++ b/Cantera/src/equil/vcs_IntStarStar.cpp
@@ -5,9 +5,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Revision: 1.1 $
- *  $Date: 2007/12/19 21:19:28 $
+ *  $Author$
+ *  $Revision$
+ *  $Date$
  */
 
 #include "vcs_IntStarStar.h"
diff --git a/Cantera/src/equil/vcs_IntStarStar.h b/Cantera/src/equil/vcs_IntStarStar.h
index bde2bcf02..653f42bb7 100644
--- a/Cantera/src/equil/vcs_IntStarStar.h
+++ b/Cantera/src/equil/vcs_IntStarStar.h
@@ -5,9 +5,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Revision: 1.1 $
- *  $Date: 2007/12/19 21:19:28 $
+ *  $Author$
+ *  $Revision$
+ *  $Date$
  */
 
 #ifndef VCS_INTSTARSTAR_H
diff --git a/Cantera/src/equil/vcs_MultiPhaseEquil.cpp b/Cantera/src/equil/vcs_MultiPhaseEquil.cpp
index e394ddf53..9d8863917 100644
--- a/Cantera/src/equil/vcs_MultiPhaseEquil.cpp
+++ b/Cantera/src/equil/vcs_MultiPhaseEquil.cpp
@@ -3,7 +3,7 @@
  *    Driver routine for the VCSnonideal equilibrium solver package
  */
 /*
- * $Id: vcs_MultiPhaseEquil.cpp,v 1.48 2009/03/28 03:07:23 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite (2006) Sandia Corporation. Under the terms of
diff --git a/Cantera/src/equil/vcs_MultiPhaseEquil.h b/Cantera/src/equil/vcs_MultiPhaseEquil.h
index 4ef1a8857..3b35973a4 100644
--- a/Cantera/src/equil/vcs_MultiPhaseEquil.h
+++ b/Cantera/src/equil/vcs_MultiPhaseEquil.h
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Revision: 1.12 $
- *  $Date: 2008/05/06 16:53:37 $
+ *  $Author$
+ *  $Revision$
+ *  $Date$
  */
 
 
diff --git a/Cantera/src/equil/vcs_SpeciesProperties.h b/Cantera/src/equil/vcs_SpeciesProperties.h
index 13d8ec9d3..7a3457a6d 100644
--- a/Cantera/src/equil/vcs_SpeciesProperties.h
+++ b/Cantera/src/equil/vcs_SpeciesProperties.h
@@ -1,5 +1,5 @@
 
-/* $Id: vcs_SpeciesProperties.h,v 1.1 2007/12/19 21:19:28 hkmoffa Exp $ */
+/* $Id$ */
 
 #ifndef VCS_SPECIES_PROPERTIES_H
 #define VCS_SPECIES_PROPERTIES_H
diff --git a/Cantera/src/equil/vcs_TP.cpp b/Cantera/src/equil/vcs_TP.cpp
index 4b9f2e0ff..83f3e3248 100644
--- a/Cantera/src/equil/vcs_TP.cpp
+++ b/Cantera/src/equil/vcs_TP.cpp
@@ -3,9 +3,9 @@
 /* | RCS Head Information on zuzax.pchem.sandia.gov | */
 /* -------------------------------------------------- */
 /* $RCSfile: vcs_TP.cpp,v $ */
-/* $Author: hkmoffa $ */
-/* $Date: 2008/12/17 16:34:18 $ */
-/* $Revision: 1.14 $ */
+/* $Author$ */
+/* $Date$ */
+/* $Revision$ */
 /* ======================================================================= */
 
 #include "vcs_solve.h"
diff --git a/Cantera/src/equil/vcs_VolPhase.cpp b/Cantera/src/equil/vcs_VolPhase.cpp
index cdac4b681..760f919ff 100644
--- a/Cantera/src/equil/vcs_VolPhase.cpp
+++ b/Cantera/src/equil/vcs_VolPhase.cpp
@@ -2,7 +2,7 @@
  * @file vcs_VolPhase.cpp
  */
 
-/* $Id: vcs_VolPhase.cpp,v 1.37 2009/07/23 14:41:40 hkmoffa Exp $ */
+/* $Id$ */
 
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/equil/vcs_VolPhase.h b/Cantera/src/equil/vcs_VolPhase.h
index 6de83bdeb..808558a16 100644
--- a/Cantera/src/equil/vcs_VolPhase.h
+++ b/Cantera/src/equil/vcs_VolPhase.h
@@ -3,7 +3,7 @@
  *   Header for the object representing each phase within vcs
  */
 /*
- * $Id: vcs_VolPhase.h,v 1.29 2009/04/18 00:42:50 hkmoffa Exp $ 
+ * $Id$ 
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/equil/vcs_defs.h b/Cantera/src/equil/vcs_defs.h
index 28e46c17c..056859ff6 100644
--- a/Cantera/src/equil/vcs_defs.h
+++ b/Cantera/src/equil/vcs_defs.h
@@ -3,7 +3,7 @@
  *    Defines and definitions within the vcs package
  */
 /*
- * $Id: vcs_defs.h,v 1.14 2009/04/18 00:42:51 hkmoffa Exp $
+ * $Id$
  */
 
 /*
diff --git a/Cantera/src/equil/vcs_elem.cpp b/Cantera/src/equil/vcs_elem.cpp
index 0c293f710..0d6d37ef8 100644
--- a/Cantera/src/equil/vcs_elem.cpp
+++ b/Cantera/src/equil/vcs_elem.cpp
@@ -5,7 +5,7 @@
  *  of the element abundances constraints.
  */
 /*
- * $Id: vcs_elem.cpp,v 1.12 2008/10/23 01:13:35 hkmoffa Exp $
+ * $Id$
  */
 
 #include "vcs_solve.h"
diff --git a/Cantera/src/equil/vcs_elem_rearrange.cpp b/Cantera/src/equil/vcs_elem_rearrange.cpp
index c86d7d8ba..95e94feaa 100644
--- a/Cantera/src/equil/vcs_elem_rearrange.cpp
+++ b/Cantera/src/equil/vcs_elem_rearrange.cpp
@@ -3,9 +3,9 @@
  *   Contains implementations for rearranging the element columns, and
  *   it contains the algorithm for choosing the rearrangement.
  */
-/*  $Author: hkmoffa $
- *  $Date: 2008/12/17 16:56:43 $
- *  $Revision: 1.13 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/equil/vcs_equilibrate.cpp b/Cantera/src/equil/vcs_equilibrate.cpp
index 6039c65d0..ed46e6c14 100644
--- a/Cantera/src/equil/vcs_equilibrate.cpp
+++ b/Cantera/src/equil/vcs_equilibrate.cpp
@@ -4,7 +4,7 @@
  */
 /*
  *
- * $Id: vcs_equilibrate.cpp,v 1.7 2009/03/18 17:27:20 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite (2006) Sandia Corporation. Under the terms of
diff --git a/Cantera/src/equil/vcs_inest.cpp b/Cantera/src/equil/vcs_inest.cpp
index e45505cad..f071a044a 100644
--- a/Cantera/src/equil/vcs_inest.cpp
+++ b/Cantera/src/equil/vcs_inest.cpp
@@ -2,9 +2,9 @@
  * @file vcs_inest.cpp
  *   Implementation methods for obtaining a good initial guess
  */
-/*  $Author: hkmoffa $
- *  $Date: 2009/03/27 22:36:20 $
- *  $Revision: 1.35 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 /*
diff --git a/Cantera/src/equil/vcs_internal.h b/Cantera/src/equil/vcs_internal.h
index 6756c4a7a..b816240e2 100644
--- a/Cantera/src/equil/vcs_internal.h
+++ b/Cantera/src/equil/vcs_internal.h
@@ -3,7 +3,7 @@
  *      Internal declarations for the VCSnonideal package
  */
 /*
- * $Id: vcs_internal.h,v 1.20 2009/04/18 00:42:51 hkmoffa Exp $
+ * $Id$
  */
 
 /*
diff --git a/Cantera/src/equil/vcs_linmaxc.cpp b/Cantera/src/equil/vcs_linmaxc.cpp
index 20c2b0398..813324eb7 100644
--- a/Cantera/src/equil/vcs_linmaxc.cpp
+++ b/Cantera/src/equil/vcs_linmaxc.cpp
@@ -1,6 +1,6 @@
-/*  $Author: hkmoffa $
- *  $Date: 2008/12/17 16:34:18 $
- *  $Revision: 1.5 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 /*
diff --git a/Cantera/src/equil/vcs_nondim.cpp b/Cantera/src/equil/vcs_nondim.cpp
index cd0a31b16..16d44448d 100644
--- a/Cantera/src/equil/vcs_nondim.cpp
+++ b/Cantera/src/equil/vcs_nondim.cpp
@@ -3,7 +3,7 @@
  *     Nondimensionalization routines within VCSnonideal
  */
 /*
- * $Id: vcs_nondim.cpp,v 1.17 2008/12/17 16:56:43 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite (2007) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/equil/vcs_phaseStability.cpp b/Cantera/src/equil/vcs_phaseStability.cpp
index 7193015d7..a0a560abf 100644
--- a/Cantera/src/equil/vcs_phaseStability.cpp
+++ b/Cantera/src/equil/vcs_phaseStability.cpp
@@ -1,7 +1,7 @@
 /* ======================================================================= */
 /* $RCSfile: vcs_phaseStability.cpp,v $ */
-/* $Date: 2009/04/18 00:42:51 $ */
-/* $Revision: 1.8 $ */
+/* $Date$ */
+/* $Revision$ */
 /* ======================================================================= */
 
 
diff --git a/Cantera/src/equil/vcs_prep.cpp b/Cantera/src/equil/vcs_prep.cpp
index eee8a75a2..5579f2211 100644
--- a/Cantera/src/equil/vcs_prep.cpp
+++ b/Cantera/src/equil/vcs_prep.cpp
@@ -4,9 +4,9 @@
  */
 
 /* $RCSfile: vcs_prep.cpp,v $ */
-/* $Author: hkmoffa $ */
-/* $Date: 2008/12/17 16:34:18 $ */
-/* $Revision: 1.25 $ */
+/* $Author$ */
+/* $Date$ */
+/* $Revision$ */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
  * Contract DE-AC04-94AL85000 with Sandia Corporation, the
diff --git a/Cantera/src/equil/vcs_prob.cpp b/Cantera/src/equil/vcs_prob.cpp
index 0993faa3c..6d1891b4c 100644
--- a/Cantera/src/equil/vcs_prob.cpp
+++ b/Cantera/src/equil/vcs_prob.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * $Id: vcs_prob.cpp,v 1.22 2008/12/17 16:56:43 hkmoffa Exp $
+ * $Id$
  */
 
 /*
diff --git a/Cantera/src/equil/vcs_prob.h b/Cantera/src/equil/vcs_prob.h
index d235c392d..70905a50b 100644
--- a/Cantera/src/equil/vcs_prob.h
+++ b/Cantera/src/equil/vcs_prob.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * $Id: vcs_prob.h,v 1.6 2008/05/06 16:53:38 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/equil/vcs_rearrange.cpp b/Cantera/src/equil/vcs_rearrange.cpp
index 4d556c784..e12310c55 100644
--- a/Cantera/src/equil/vcs_rearrange.cpp
+++ b/Cantera/src/equil/vcs_rearrange.cpp
@@ -3,7 +3,7 @@
  *    implementation file for rearranging species.
  */
 /*
- * $Id: vcs_rearrange.cpp,v 1.5 2008/12/17 16:34:18 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite (2007) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/equil/vcs_report.cpp b/Cantera/src/equil/vcs_report.cpp
index 9beb9a1f2..94dde2c62 100644
--- a/Cantera/src/equil/vcs_report.cpp
+++ b/Cantera/src/equil/vcs_report.cpp
@@ -1,5 +1,5 @@
 /*  
- * $Id: vcs_report.cpp,v 1.38 2009/04/01 01:16:40 hkmoffa Exp $
+ * $Id$
  */
 
 /*
diff --git a/Cantera/src/equil/vcs_root1d.cpp b/Cantera/src/equil/vcs_root1d.cpp
index b7bdf4085..bb8116b96 100644
--- a/Cantera/src/equil/vcs_root1d.cpp
+++ b/Cantera/src/equil/vcs_root1d.cpp
@@ -3,7 +3,7 @@
  *  Code for a one dimensional root finder program.
  */
 /*
- *  $Id: vcs_root1d.cpp,v 1.5 2008/12/17 16:34:18 hkmoffa Exp $
+ *  $Id$
  */
 /*
  * Copywrite (2006) Sandia Corporation. Under the terms of
diff --git a/Cantera/src/equil/vcs_rxnadj.cpp b/Cantera/src/equil/vcs_rxnadj.cpp
index 72d14fb55..0a4983045 100644
--- a/Cantera/src/equil/vcs_rxnadj.cpp
+++ b/Cantera/src/equil/vcs_rxnadj.cpp
@@ -3,7 +3,7 @@
  *  Routines for carrying out various adjustments to the reaction steps
  */
 /*
- *  $Id: vcs_rxnadj.cpp,v 1.34 2009/04/18 00:42:51 hkmoffa Exp $
+ *  $Id$
  */
 /*
  * Copywrite (2006) Sandia Corporation. Under the terms of
diff --git a/Cantera/src/equil/vcs_setMolesLinProg.cpp b/Cantera/src/equil/vcs_setMolesLinProg.cpp
index bd3e64d51..425600cae 100644
--- a/Cantera/src/equil/vcs_setMolesLinProg.cpp
+++ b/Cantera/src/equil/vcs_setMolesLinProg.cpp
@@ -3,7 +3,7 @@
  *
  */
 /*
- * $Id: vcs_setMolesLinProg.cpp,v 1.11 2008/12/17 16:34:18 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/equil/vcs_solve.cpp b/Cantera/src/equil/vcs_solve.cpp
index 354a7e16a..108d1dcbc 100644
--- a/Cantera/src/equil/vcs_solve.cpp
+++ b/Cantera/src/equil/vcs_solve.cpp
@@ -3,7 +3,7 @@
  *    Header file for the internal class that holds the problem.
  */
 /*
- * $Id: vcs_solve.cpp,v 1.60 2008/12/17 16:56:43 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/equil/vcs_solve.h b/Cantera/src/equil/vcs_solve.h
index 2337632cc..64acf7ee0 100644
--- a/Cantera/src/equil/vcs_solve.h
+++ b/Cantera/src/equil/vcs_solve.h
@@ -3,7 +3,7 @@
  *    Header file for the internal object that holds the problem
  */
 /*
- * $Id: vcs_solve.h,v 1.75 2009/04/18 00:42:51 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/equil/vcs_solve_TP.cpp b/Cantera/src/equil/vcs_solve_TP.cpp
index cff79e653..5d8bae98b 100644
--- a/Cantera/src/equil/vcs_solve_TP.cpp
+++ b/Cantera/src/equil/vcs_solve_TP.cpp
@@ -3,7 +3,7 @@
  *     main algorithm for finding an equilibrium
  */
 /*
- * $Id: vcs_solve_TP.cpp,v 1.93 2009/04/18 00:42:51 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/equil/vcs_species_thermo.cpp b/Cantera/src/equil/vcs_species_thermo.cpp
index c51507d3b..1a33fcf80 100644
--- a/Cantera/src/equil/vcs_species_thermo.cpp
+++ b/Cantera/src/equil/vcs_species_thermo.cpp
@@ -3,7 +3,7 @@
  *   Implementation for the VCS_SPECIES_THERMO object.
  */
 /*
- * $Id: vcs_species_thermo.cpp,v 1.18 2008/12/17 16:34:18 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/equil/vcs_species_thermo.h b/Cantera/src/equil/vcs_species_thermo.h
index 047cc4c20..268b9731f 100644
--- a/Cantera/src/equil/vcs_species_thermo.h
+++ b/Cantera/src/equil/vcs_species_thermo.h
@@ -1,5 +1,5 @@
 /*
- * $Id: vcs_species_thermo.h,v 1.3 2008/04/28 16:08:35 hkmoffa Exp $
+ * $Id$
  */
 
 /*
diff --git a/Cantera/src/equil/vcs_util.cpp b/Cantera/src/equil/vcs_util.cpp
index a39ea4915..ae34e3a12 100644
--- a/Cantera/src/equil/vcs_util.cpp
+++ b/Cantera/src/equil/vcs_util.cpp
@@ -3,7 +3,7 @@
  *  Internal definitions for utility functions for the VCSnonideal package
  */
 /*
- * $Id: vcs_util.cpp,v 1.13 2009/07/06 22:30:58 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/equil/vcs_xerror.c b/Cantera/src/equil/vcs_xerror.c
index 32b0dd269..a7d98d18a 100644
--- a/Cantera/src/equil/vcs_xerror.c
+++ b/Cantera/src/equil/vcs_xerror.c
@@ -21,9 +21,9 @@ static integer c__1 = 1;
 /* -------------------------------------------------- */
 /* | CVS Head Information                           | */
 /* -------------------------------------------------- */
-/* $Author: hkmoffa $ */
-/* $Date: 2008/01/03 21:38:25 $ */
-/* $Revision: 1.1 $ */
+/* $Author$ */
+/* $Date$ */
+/* $Revision$ */
 /* ======================================================================= */
 
 /* Subroutine */ int s88fmt_(integer *n, integer *ivalue, integer *ifmt)
diff --git a/Cantera/src/kinetics/AqueousKinetics.cpp b/Cantera/src/kinetics/AqueousKinetics.cpp
index 7590bba54..0559dec2b 100644
--- a/Cantera/src/kinetics/AqueousKinetics.cpp
+++ b/Cantera/src/kinetics/AqueousKinetics.cpp
@@ -11,8 +11,8 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Date: 2009/02/11 01:50:54 $
- *  $Revision: 1.1 $
+ *  $Date$
+ *  $Revision$
  */
 
 
diff --git a/Cantera/src/kinetics/AqueousKinetics.h b/Cantera/src/kinetics/AqueousKinetics.h
index bcdd1d9e7..a23bc0626 100644
--- a/Cantera/src/kinetics/AqueousKinetics.h
+++ b/Cantera/src/kinetics/AqueousKinetics.h
@@ -3,9 +3,9 @@
  *
  * @ingroup chemkinetics
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2009/02/11 01:50:57 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/EdgeKinetics.h b/Cantera/src/kinetics/EdgeKinetics.h
index c5e2168ca..b19e7b3e6 100644
--- a/Cantera/src/kinetics/EdgeKinetics.h
+++ b/Cantera/src/kinetics/EdgeKinetics.h
@@ -5,9 +5,9 @@
  * @ingroup electrochem
  */
 
-/* $Author: hkmoffa $
- * $Revision: 1.4 $
- * $Date: 2008/12/16 20:32:18 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/Enhanced3BConc.h b/Cantera/src/kinetics/Enhanced3BConc.h
index 7d927eafd..0aa892a64 100644
--- a/Cantera/src/kinetics/Enhanced3BConc.h
+++ b/Cantera/src/kinetics/Enhanced3BConc.h
@@ -2,9 +2,9 @@
  *  @file Enhanced3BConc.h
  */
 
-/*  $Author: dggoodwin $
- *  $Date: 2007/05/04 14:27:23 $
- *  $Revision: 1.1 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/FalloffFactory.cpp b/Cantera/src/kinetics/FalloffFactory.cpp
index 1e9108df7..fa3f41cf0 100644
--- a/Cantera/src/kinetics/FalloffFactory.cpp
+++ b/Cantera/src/kinetics/FalloffFactory.cpp
@@ -2,9 +2,9 @@
  *  @file FalloffFactory.cpp
  */
 
-/*  $Author: hkmoffa $
- *  $Date: 2008/12/29 21:34:08 $
- *  $Revision: 1.6 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/FalloffFactory.h b/Cantera/src/kinetics/FalloffFactory.h
index fd1605cd7..cbf3a88af 100644
--- a/Cantera/src/kinetics/FalloffFactory.h
+++ b/Cantera/src/kinetics/FalloffFactory.h
@@ -6,8 +6,8 @@
  */
 
 /*
- *  $Date: 2008/12/29 21:34:08 $
- *  $Revision: 1.4 $
+ *  $Date$
+ *  $Revision$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/FalloffMgr.h b/Cantera/src/kinetics/FalloffMgr.h
index d09cff962..a36d7bcce 100644
--- a/Cantera/src/kinetics/FalloffMgr.h
+++ b/Cantera/src/kinetics/FalloffMgr.h
@@ -1,9 +1,9 @@
 /**
  *  @file FalloffMgr.h
  *
- *  $Author: dggoodwin $
- *  $Date: 2007/05/10 03:28:32 $
- *  $Revision: 1.2 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/GasKinetics.h b/Cantera/src/kinetics/GasKinetics.h
index bd2c55d0b..7dee80dcd 100644
--- a/Cantera/src/kinetics/GasKinetics.h
+++ b/Cantera/src/kinetics/GasKinetics.h
@@ -3,9 +3,9 @@
  *
  * @ingroup chemkinetics
  *
- * $Author: hkmoffa $
- * $Revision: 1.8 $
- * $Date: 2008/12/29 21:34:08 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/GasKineticsWriter.h b/Cantera/src/kinetics/GasKineticsWriter.h
index fe3be0de0..88b07a213 100644
--- a/Cantera/src/kinetics/GasKineticsWriter.h
+++ b/Cantera/src/kinetics/GasKineticsWriter.h
@@ -2,9 +2,9 @@
  *
  * @file GasKineticsWriter.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.3 $
- * $Date: 2008/12/17 17:09:37 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/Group.cpp b/Cantera/src/kinetics/Group.cpp
index b799def71..4c58727d0 100644
--- a/Cantera/src/kinetics/Group.cpp
+++ b/Cantera/src/kinetics/Group.cpp
@@ -3,9 +3,9 @@
  *
  *  Implementation file for the Group class used in reaction path analysis.
  *
- * $Author: hkmoffa $
- * $Revision: 1.2 $
- * $Date: 2008/12/29 21:34:08 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/Group.h b/Cantera/src/kinetics/Group.h
index c1e2ebdca..82e13b74f 100644
--- a/Cantera/src/kinetics/Group.h
+++ b/Cantera/src/kinetics/Group.h
@@ -1,9 +1,9 @@
 /**
  *  @file Group.h
  *
- * $Author: dggoodwin $
- * $Revision: 1.1 $
- * $Date: 2007/05/04 14:27:23 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 
diff --git a/Cantera/src/kinetics/ImplicitChem.cpp b/Cantera/src/kinetics/ImplicitChem.cpp
index 57cad99db..5a05e2f76 100644
--- a/Cantera/src/kinetics/ImplicitChem.cpp
+++ b/Cantera/src/kinetics/ImplicitChem.cpp
@@ -2,9 +2,9 @@
  *  @file ImplicitChem.cpp
  */
 
-/* $Author: dggoodwin $
- * $Revision: 1.1 $
- * $Date: 2007/05/04 14:27:23 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/ImplicitChem.h b/Cantera/src/kinetics/ImplicitChem.h
index 7d17c06b3..96180bdee 100644
--- a/Cantera/src/kinetics/ImplicitChem.h
+++ b/Cantera/src/kinetics/ImplicitChem.h
@@ -1,9 +1,9 @@
 /**
  *  @file ImplicitChem.h
  *
- * $Author: dggoodwin $
- * $Revision: 1.1 $
- * $Date: 2007/05/04 14:27:23 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/ImplicitSurfChem.cpp b/Cantera/src/kinetics/ImplicitSurfChem.cpp
index 1801b7001..28e82d45a 100644
--- a/Cantera/src/kinetics/ImplicitSurfChem.cpp
+++ b/Cantera/src/kinetics/ImplicitSurfChem.cpp
@@ -6,9 +6,9 @@
  */
 
 /*
- * $Author: hkmoffa $
- * $Revision: 1.4 $
- * $Date: 2007/08/29 19:57:48 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/ImplicitSurfChem.h b/Cantera/src/kinetics/ImplicitSurfChem.h
index 57b233998..adc0fcdce 100644
--- a/Cantera/src/kinetics/ImplicitSurfChem.h
+++ b/Cantera/src/kinetics/ImplicitSurfChem.h
@@ -6,9 +6,9 @@
  */
 
 /*
- * $Author: hkmoffa $
- * $Revision: 1.3 $
- * $Date: 2007/08/23 21:43:07 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/InterfaceKinetics.h b/Cantera/src/kinetics/InterfaceKinetics.h
index 261947bf9..3de46a1f1 100644
--- a/Cantera/src/kinetics/InterfaceKinetics.h
+++ b/Cantera/src/kinetics/InterfaceKinetics.h
@@ -4,9 +4,9 @@
  * @ingroup chemkinetics
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.11 $
- * $Date: 2008/12/17 17:09:37 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/Kinetics.cpp b/Cantera/src/kinetics/Kinetics.cpp
index f7ac93ff7..38ea75fe0 100644
--- a/Cantera/src/kinetics/Kinetics.cpp
+++ b/Cantera/src/kinetics/Kinetics.cpp
@@ -7,8 +7,8 @@
  *      Kinetics managers calculate rates of progress of species due to homogeneous or heterogeneous kinetics.
  */
 /*
- *  $Date: 2008/12/16 20:32:18 $
- *  $Revision: 1.3 $
+ *  $Date$
+ *  $Revision$
  */
 
 // Copyright 2001-2004  California Institute of Technology            
diff --git a/Cantera/src/kinetics/Kinetics.h b/Cantera/src/kinetics/Kinetics.h
index 69c6ebca8..25ca5305f 100644
--- a/Cantera/src/kinetics/Kinetics.h
+++ b/Cantera/src/kinetics/Kinetics.h
@@ -4,8 +4,8 @@
  *  module documentation (see \ref  kineticsmgr and class 
  *  \link Cantera::Kinetics Kinetics\endlink).
  *
- *  $Date: 2008/12/16 20:32:18 $
- *  $Revision: 1.8 $
+ *  $Date$
+ *  $Revision$
  */
 
 // Copyright 2001-2004  California Institute of Technology
diff --git a/Cantera/src/kinetics/KineticsFactory.cpp b/Cantera/src/kinetics/KineticsFactory.cpp
index 142bdc36f..0d811f63e 100644
--- a/Cantera/src/kinetics/KineticsFactory.cpp
+++ b/Cantera/src/kinetics/KineticsFactory.cpp
@@ -3,9 +3,9 @@
  */
 
 /*
- * $Author: hkmoffa $
- * $Revision: 1.4 $
- * $Date: 2009/02/11 20:01:45 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/KineticsFactory.h b/Cantera/src/kinetics/KineticsFactory.h
index 4fdc9c6be..f4336c96d 100644
--- a/Cantera/src/kinetics/KineticsFactory.h
+++ b/Cantera/src/kinetics/KineticsFactory.h
@@ -3,9 +3,9 @@
  */
 
 /*
- * $Author: hkmoffa $
- * $Revision: 1.3 $
- * $Date: 2009/02/11 01:50:58 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/Makefile.in b/Cantera/src/kinetics/Makefile.in
index 19700d7d6..cfd625c43 100644
--- a/Cantera/src/kinetics/Makefile.in
+++ b/Cantera/src/kinetics/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2009/02/11 01:50:58 $
-#  $Revision: 1.10 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2002 California Institute of Technology
 #
diff --git a/Cantera/src/kinetics/RateCoeffMgr.h b/Cantera/src/kinetics/RateCoeffMgr.h
index fba1ae9d4..792c14617 100644
--- a/Cantera/src/kinetics/RateCoeffMgr.h
+++ b/Cantera/src/kinetics/RateCoeffMgr.h
@@ -3,9 +3,9 @@
  */
 
 /*
- * $Author: dggoodwin $
- * $Revision: 1.1 $
- * $Date: 2007/05/04 14:27:23 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/ReactionData.h b/Cantera/src/kinetics/ReactionData.h
index 6c7665a31..99541ed14 100644
--- a/Cantera/src/kinetics/ReactionData.h
+++ b/Cantera/src/kinetics/ReactionData.h
@@ -3,9 +3,9 @@
  *
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.2 $
- * $Date: 2007/06/04 23:05:07 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/ReactionPath.cpp b/Cantera/src/kinetics/ReactionPath.cpp
index 4b2feb41f..af42f38a2 100644
--- a/Cantera/src/kinetics/ReactionPath.cpp
+++ b/Cantera/src/kinetics/ReactionPath.cpp
@@ -4,9 +4,9 @@
  */
 
 /*
- * $Author: dggoodwin $
- * $Revision: 1.2 $
- * $Date: 2008/02/05 23:36:12 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/ReactionPath.h b/Cantera/src/kinetics/ReactionPath.h
index 5100648b7..f2ccf67d6 100644
--- a/Cantera/src/kinetics/ReactionPath.h
+++ b/Cantera/src/kinetics/ReactionPath.h
@@ -3,9 +3,9 @@
  *
  *  Classes for reaction path analysis.
  *
- * $Author: dggoodwin $
- * $Revision: 1.1 $
- * $Date: 2007/05/04 14:27:23 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/ReactionStoichMgr.cpp b/Cantera/src/kinetics/ReactionStoichMgr.cpp
index dca9fc3b5..67f09f37a 100644
--- a/Cantera/src/kinetics/ReactionStoichMgr.cpp
+++ b/Cantera/src/kinetics/ReactionStoichMgr.cpp
@@ -5,9 +5,9 @@
 ///
 //------------------------------------------------
 
-// $Author: dggoodwin $
-// $Revision: 1.1 $
-// $Date: 2007/05/04 15:48:44 $
+// $Author$
+// $Revision$
+// $Date$
 
 // turn off warnings under Windows
 #ifdef WIN32
diff --git a/Cantera/src/kinetics/ReactionStoichMgr.h b/Cantera/src/kinetics/ReactionStoichMgr.h
index d8121d700..203bfc5e4 100644
--- a/Cantera/src/kinetics/ReactionStoichMgr.h
+++ b/Cantera/src/kinetics/ReactionStoichMgr.h
@@ -5,9 +5,9 @@
  */
 
 /*
- * $Author: hkmoffa $
- * $Revision: 1.2 $
- * $Date: 2007/06/12 14:20:02 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 #ifndef CT_RXN_STOICH
diff --git a/Cantera/src/kinetics/RxnRates.h b/Cantera/src/kinetics/RxnRates.h
index a17f549d7..44f0c6a70 100644
--- a/Cantera/src/kinetics/RxnRates.h
+++ b/Cantera/src/kinetics/RxnRates.h
@@ -3,9 +3,9 @@
  *
  */
 
-/* $Author: dggoodwin $
- * $Revision: 1.1 $
- * $Date: 2007/05/04 14:27:23 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/StoichManager.h b/Cantera/src/kinetics/StoichManager.h
index d699c68d9..826ae9ee8 100644
--- a/Cantera/src/kinetics/StoichManager.h
+++ b/Cantera/src/kinetics/StoichManager.h
@@ -1,9 +1,9 @@
 /**
  *  @file StoichManager.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.2 $
- * $Date: 2007/05/17 21:17:16 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/ThirdBodyMgr.h b/Cantera/src/kinetics/ThirdBodyMgr.h
index 63ccea4f8..33ab92c22 100644
--- a/Cantera/src/kinetics/ThirdBodyMgr.h
+++ b/Cantera/src/kinetics/ThirdBodyMgr.h
@@ -1,9 +1,9 @@
 /**
  *  @file ThirdBodyMgr.h
  *
- * $Author: dggoodwin $
- * $Revision: 1.1 $
- * $Date: 2007/05/04 14:27:23 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/kinetics/importKinetics.cpp b/Cantera/src/kinetics/importKinetics.cpp
index 7641bdd9b..5313286ab 100644
--- a/Cantera/src/kinetics/importKinetics.cpp
+++ b/Cantera/src/kinetics/importKinetics.cpp
@@ -10,9 +10,9 @@
  *     from the ctml tree structures.
  */
 
-/* $Author: hkmoffa $
- * $Revision: 1.10 $
- * $Date: 2009/03/13 03:23:20 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2002  California Institute of Technology
diff --git a/Cantera/src/kinetics/importKinetics.h b/Cantera/src/kinetics/importKinetics.h
index 8735ac18d..404937bc7 100644
--- a/Cantera/src/kinetics/importKinetics.h
+++ b/Cantera/src/kinetics/importKinetics.h
@@ -10,9 +10,9 @@
  *     from the ctml tree structures.
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.2 $
- * $Date: 2007/06/04 23:09:19 $
+ * $Author$
+ * $Revision$
+ * $Date$
  *
  */
 
diff --git a/Cantera/src/kinetics/reaction_defs.h b/Cantera/src/kinetics/reaction_defs.h
index 8e6123915..eb36dc544 100644
--- a/Cantera/src/kinetics/reaction_defs.h
+++ b/Cantera/src/kinetics/reaction_defs.h
@@ -4,9 +4,9 @@
  */
   
 /*
- *  $Author: dggoodwin $
- *  $Date: 2007/05/04 14:27:24 $
- *  $Revision: 1.1 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  */
 
diff --git a/Cantera/src/kinetics/solveSP.cpp b/Cantera/src/kinetics/solveSP.cpp
index a91f0a3c9..a44757365 100644
--- a/Cantera/src/kinetics/solveSP.cpp
+++ b/Cantera/src/kinetics/solveSP.cpp
@@ -2,7 +2,7 @@
  * @file: solveSP.cpp Implicit surface site concentration solver
  */
 /*
- * $Id: solveSP.cpp,v 1.4 2008/12/17 17:09:37 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/kinetics/solveSP.h b/Cantera/src/kinetics/solveSP.h
index 7caf9b334..f4d679d3e 100644
--- a/Cantera/src/kinetics/solveSP.h
+++ b/Cantera/src/kinetics/solveSP.h
@@ -4,7 +4,7 @@
  *  (see \ref chemkinetics and class \link Cantera::solveSP solveSP\endlink).
  */
 /*
- * $Id: solveSP.h,v 1.3 2007/12/30 04:19:38 dggoodwin Exp $
+ * $Id$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/numerics/ArrayViewer.h b/Cantera/src/numerics/ArrayViewer.h
index cc6bcfbe5..112648530 100755
--- a/Cantera/src/numerics/ArrayViewer.h
+++ b/Cantera/src/numerics/ArrayViewer.h
@@ -4,9 +4,9 @@
  *  Header file for class ArrayViewer
  */
 
-/*  $Author: dggoodwin $
- *  $Revision: 1.1 $
- *  $Date: 2007/05/04 14:40:26 $
+/*  $Author$
+ *  $Revision$
+ *  $Date$
  *
  */
 
diff --git a/Cantera/src/numerics/BandMatrix.h b/Cantera/src/numerics/BandMatrix.h
index 3d5512108..d3f7fdd3e 100755
--- a/Cantera/src/numerics/BandMatrix.h
+++ b/Cantera/src/numerics/BandMatrix.h
@@ -5,9 +5,9 @@
  */
 
 /*
- *  $Author: dggoodwin $
- *  $Revision: 1.1 $
- *  $Date: 2007/05/04 14:40:26 $
+ *  $Author$
+ *  $Revision$
+ *  $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/numerics/CVodeInt.cpp b/Cantera/src/numerics/CVodeInt.cpp
index 74e77b4ec..658094a5e 100644
--- a/Cantera/src/numerics/CVodeInt.cpp
+++ b/Cantera/src/numerics/CVodeInt.cpp
@@ -1,7 +1,7 @@
 /**
  *  @file CVodeInt.cpp
  *
- *  $Id: CVodeInt.cpp,v 1.1 2009/07/17 15:32:51 hkmoffa Exp $
+ *  $Id$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/numerics/CVodeInt.h b/Cantera/src/numerics/CVodeInt.h
index 7a909ff39..ac1836b1a 100644
--- a/Cantera/src/numerics/CVodeInt.h
+++ b/Cantera/src/numerics/CVodeInt.h
@@ -2,9 +2,9 @@
  *  @file CVodeInt.h
  */
 
-/* $Author: hkmoffa $
- * $Date: 2009/07/17 15:32:51 $
- * $Revision: 1.1 $
+/* $Author$
+ * $Date$
+ * $Revision$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/numerics/CVodesIntegrator.h b/Cantera/src/numerics/CVodesIntegrator.h
index a72a8ff12..99a0a9cbb 100644
--- a/Cantera/src/numerics/CVodesIntegrator.h
+++ b/Cantera/src/numerics/CVodesIntegrator.h
@@ -3,8 +3,8 @@
  */
 
 /* 
- * $Date: 2009/03/27 21:32:33 $
- * $Revision: 1.3 $
+ * $Date$
+ * $Revision$
  */
 
 // Copyright 2005  California Institute of Technology
diff --git a/Cantera/src/numerics/DAE_Solver.h b/Cantera/src/numerics/DAE_Solver.h
index 332950a0c..4d570cca7 100644
--- a/Cantera/src/numerics/DAE_Solver.h
+++ b/Cantera/src/numerics/DAE_Solver.h
@@ -6,8 +6,8 @@
  */
 
 /*  
- *  $Date: 2009/03/27 23:39:26 $
- *  $Revision: 1.4 $
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2006 California Institute of Technology
  *
diff --git a/Cantera/src/numerics/DASPK.cpp b/Cantera/src/numerics/DASPK.cpp
index 08e75495c..301131946 100755
--- a/Cantera/src/numerics/DASPK.cpp
+++ b/Cantera/src/numerics/DASPK.cpp
@@ -3,8 +3,8 @@
  *
  */
 /*
- *  $Date: 2009/03/27 23:39:26 $
- *  $Revision: 1.2 $
+ *  $Date$
+ *  $Revision$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/numerics/DASPK.h b/Cantera/src/numerics/DASPK.h
index 1ef8c80e2..7ae5ccc0c 100755
--- a/Cantera/src/numerics/DASPK.h
+++ b/Cantera/src/numerics/DASPK.h
@@ -6,8 +6,8 @@
  */
 
 /* 
- *  $Date: 2009/03/27 23:39:26 $
- *  $Revision: 1.3 $
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001 California Institute of Technology
  *
diff --git a/Cantera/src/numerics/DenseMatrix.h b/Cantera/src/numerics/DenseMatrix.h
index 0473b8885..613bb948b 100755
--- a/Cantera/src/numerics/DenseMatrix.h
+++ b/Cantera/src/numerics/DenseMatrix.h
@@ -5,9 +5,9 @@
  */
 
 /*
- *  $Author: dggoodwin $
- *  $Date: 2008/02/05 23:36:12 $
- *  $Revision: 1.2 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  */
 
diff --git a/Cantera/src/numerics/Func1.h b/Cantera/src/numerics/Func1.h
index b6a6b2504..fa3e6b23f 100644
--- a/Cantera/src/numerics/Func1.h
+++ b/Cantera/src/numerics/Func1.h
@@ -1,9 +1,9 @@
 /**
  *  @file Func1.h
  *
- *  $Author: hkmoffa $
- *  $Date: 2009/03/23 23:25:31 $
- *  $Revision: 1.2 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/numerics/IDA_Solver.h b/Cantera/src/numerics/IDA_Solver.h
index d981a850f..59546d991 100644
--- a/Cantera/src/numerics/IDA_Solver.h
+++ b/Cantera/src/numerics/IDA_Solver.h
@@ -5,9 +5,9 @@
  *  Header file for class IDA_Solver
  */
 
-/*  $Author: hkmoffa $
- *  $Date: 2008/04/08 20:19:27 $
- *  $Revision: 1.3 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2006 California Institute of Technology
  *
diff --git a/Cantera/src/numerics/Integrator.h b/Cantera/src/numerics/Integrator.h
index 2006f62e8..6b498dc0a 100644
--- a/Cantera/src/numerics/Integrator.h
+++ b/Cantera/src/numerics/Integrator.h
@@ -1,9 +1,9 @@
 /**
  *  @file Integrator.h
  *
- *  $Author: hkmoffa $
- *  $Date: 2009/05/13 21:49:11 $
- *  $Revision: 1.2 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  */
 
diff --git a/Cantera/src/numerics/Makefile.in b/Cantera/src/numerics/Makefile.in
index 39c86c8de..bffd2a159 100644
--- a/Cantera/src/numerics/Makefile.in
+++ b/Cantera/src/numerics/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2009/07/17 15:32:51 $
-#  $Revision: 1.13 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2002 California Institute of Technology
 #
diff --git a/Cantera/src/numerics/NonlinearSolver.cpp b/Cantera/src/numerics/NonlinearSolver.cpp
index d8200fd00..caae05959 100644
--- a/Cantera/src/numerics/NonlinearSolver.cpp
+++ b/Cantera/src/numerics/NonlinearSolver.cpp
@@ -6,8 +6,8 @@
  */
 
 /*
- *  $Date: 2009/03/27 21:32:33 $
- *  $Revision: 1.5 $
+ *  $Date$
+ *  $Revision$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/numerics/NonlinearSolver.h b/Cantera/src/numerics/NonlinearSolver.h
index e51819965..420ce23e1 100644
--- a/Cantera/src/numerics/NonlinearSolver.h
+++ b/Cantera/src/numerics/NonlinearSolver.h
@@ -6,8 +6,8 @@
  */
 
 /*
- *  $Date: 2009/02/14 18:02:22 $
- *  $Revision: 1.4 $
+ *  $Date$
+ *  $Revision$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/numerics/ResidEval.h b/Cantera/src/numerics/ResidEval.h
index 03b30a0d9..ec61bd2d2 100755
--- a/Cantera/src/numerics/ResidEval.h
+++ b/Cantera/src/numerics/ResidEval.h
@@ -3,8 +3,8 @@
  *
  */
 /*
- *  $Date: 2009/02/11 19:57:24 $
- *  $Revision: 1.2 $
+ *  $Date$
+ *  $Revision$
  */
 // Copyright 2006  California Institute of Technology
 
diff --git a/Cantera/src/numerics/ResidJacEval.cpp b/Cantera/src/numerics/ResidJacEval.cpp
index 124534fe4..18168c055 100644
--- a/Cantera/src/numerics/ResidJacEval.cpp
+++ b/Cantera/src/numerics/ResidJacEval.cpp
@@ -3,8 +3,8 @@
  *
  */
 /*
- * $Revision: 1.2 $
- * $Date: 2009/03/03 17:55:25 $
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/numerics/ResidJacEval.h b/Cantera/src/numerics/ResidJacEval.h
index 52f950d29..daa3bb6aa 100644
--- a/Cantera/src/numerics/ResidJacEval.h
+++ b/Cantera/src/numerics/ResidJacEval.h
@@ -5,8 +5,8 @@
  */
 
 /*
- *  $Date: 2009/04/02 14:24:05 $
- *  $Revision: 1.3 $
+ *  $Date$
+ *  $Revision$
  *
  */
 /*
diff --git a/Cantera/src/numerics/SquareMatrix.cpp b/Cantera/src/numerics/SquareMatrix.cpp
index 35d3e86a3..8b34c083f 100644
--- a/Cantera/src/numerics/SquareMatrix.cpp
+++ b/Cantera/src/numerics/SquareMatrix.cpp
@@ -3,8 +3,8 @@
  *
  */
 /*
- * $Revision: 1.1 $
- * $Date: 2009/01/27 15:59:13 $
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/numerics/SquareMatrix.h b/Cantera/src/numerics/SquareMatrix.h
index 26de64517..d6c767952 100644
--- a/Cantera/src/numerics/SquareMatrix.h
+++ b/Cantera/src/numerics/SquareMatrix.h
@@ -4,8 +4,8 @@
  */
 
 /*
- *  $Date: 2009/03/03 21:20:32 $
- *  $Revision: 1.2 $
+ *  $Date$
+ *  $Revision$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/numerics/ctlapack.h b/Cantera/src/numerics/ctlapack.h
index c3dda9959..0b5a6da3a 100755
--- a/Cantera/src/numerics/ctlapack.h
+++ b/Cantera/src/numerics/ctlapack.h
@@ -2,9 +2,9 @@
  * @file ctlapack.h
  */
 
-/* $Author: dggoodwin $
- * $Revision: 1.2 $
- * $Date: 2008/02/05 23:36:12 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001 California Institute of Technology.  
diff --git a/Cantera/src/numerics/funcs.cpp b/Cantera/src/numerics/funcs.cpp
index c1276244d..81ce55810 100755
--- a/Cantera/src/numerics/funcs.cpp
+++ b/Cantera/src/numerics/funcs.cpp
@@ -3,9 +3,9 @@
  *                numerical functions. 
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/07/30 16:48:25 $
- *  $Revision: 1.2 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001-2003 California Institute of Technology
  *  See file License.txt for licensing information
diff --git a/Cantera/src/numerics/funcs.h b/Cantera/src/numerics/funcs.h
index b12f80306..8774f195e 100644
--- a/Cantera/src/numerics/funcs.h
+++ b/Cantera/src/numerics/funcs.h
@@ -3,9 +3,9 @@
  *                numerical functions. 
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/07/30 16:48:25 $
- *  $Revision: 1.2 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001-2003 California Institute of Technology
  *  See file License.txt for licensing information
diff --git a/Cantera/src/numerics/polyfit.h b/Cantera/src/numerics/polyfit.h
index 99645f83f..b8436ae34 100755
--- a/Cantera/src/numerics/polyfit.h
+++ b/Cantera/src/numerics/polyfit.h
@@ -2,9 +2,9 @@
  *  @file polyfit.h  C interface for Fortran DPOLFT subroutine
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/07/30 16:48:25 $
- *  $Revision: 1.2 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001-2003 California Institute of Technology
  *  See file License.txt for licensing information
diff --git a/Cantera/src/numerics/sort.cpp b/Cantera/src/numerics/sort.cpp
index 66120c70c..ed6fc21c4 100755
--- a/Cantera/src/numerics/sort.cpp
+++ b/Cantera/src/numerics/sort.cpp
@@ -1,7 +1,7 @@
 /**
  *  @file sort.cpp
  *
- *  $Id: sort.cpp,v 1.1 2007/05/04 14:40:27 dggoodwin Exp $
+ *  $Id$
  */
 
 #ifdef WIN32
diff --git a/Cantera/src/numerics/sort.h b/Cantera/src/numerics/sort.h
index 1e33851e5..e83ab53b0 100755
--- a/Cantera/src/numerics/sort.h
+++ b/Cantera/src/numerics/sort.h
@@ -1,7 +1,7 @@
 /**
  *  @file sort.h
  *
- *  $Id: sort.h,v 1.1 2007/05/04 14:40:27 dggoodwin Exp $
+ *  $Id$
  */
 
 #ifndef CT_SORT_H
diff --git a/Cantera/src/oneD/Domain1D.h b/Cantera/src/oneD/Domain1D.h
index 7d57583ec..256432431 100644
--- a/Cantera/src/oneD/Domain1D.h
+++ b/Cantera/src/oneD/Domain1D.h
@@ -1,9 +1,9 @@
 /**
  *  @file Domain1D.h
  *
- *  $Author: hkmoffa $
- *  $Date: 2009/05/31 16:24:35 $
- *  $Revision: 1.26 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/Cantera/src/oneD/Inlet1D.h b/Cantera/src/oneD/Inlet1D.h
index b12fc99a3..373aaafde 100644
--- a/Cantera/src/oneD/Inlet1D.h
+++ b/Cantera/src/oneD/Inlet1D.h
@@ -6,9 +6,9 @@
  */
 
 /*
- * $Author: dggoodwin $
- * $Revision: 1.20 $
- * $Date: 2007/05/04 14:41:27 $
+ * $Author$
+ * $Revision$
+ * $Date$
  *
  * Copyright 2002-3  California Institute of Technology
  */
diff --git a/Cantera/src/oneD/Makefile.in b/Cantera/src/oneD/Makefile.in
index 9afea4ab5..ad4c6a0a5 100644
--- a/Cantera/src/oneD/Makefile.in
+++ b/Cantera/src/oneD/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2008/12/30 21:49:41 $
-#  $Revision: 1.16 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2002 California Institute of Technology
 #
diff --git a/Cantera/src/oneD/MultiJac.cpp b/Cantera/src/oneD/MultiJac.cpp
index eead1da28..69003381c 100644
--- a/Cantera/src/oneD/MultiJac.cpp
+++ b/Cantera/src/oneD/MultiJac.cpp
@@ -6,9 +6,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/17 17:13:03 $
- *  $Revision: 1.13 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/Cantera/src/oneD/MultiJac.h b/Cantera/src/oneD/MultiJac.h
index a91ea804e..a99a24a09 100644
--- a/Cantera/src/oneD/MultiJac.h
+++ b/Cantera/src/oneD/MultiJac.h
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: dggoodwin $
- *  $Date: 2007/05/04 14:41:27 $
- *  $Revision: 1.3 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/Cantera/src/oneD/MultiNewton.cpp b/Cantera/src/oneD/MultiNewton.cpp
index c9cb239aa..e85f4da54 100644
--- a/Cantera/src/oneD/MultiNewton.cpp
+++ b/Cantera/src/oneD/MultiNewton.cpp
@@ -6,9 +6,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/17 17:13:03 $
- *  $Revision: 1.20 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001 California Institute of Technology
  *
diff --git a/Cantera/src/oneD/MultiNewton.h b/Cantera/src/oneD/MultiNewton.h
index 95c90c516..8a4298981 100644
--- a/Cantera/src/oneD/MultiNewton.h
+++ b/Cantera/src/oneD/MultiNewton.h
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: dggoodwin $
- *  $Date: 2006/11/27 21:43:34 $
- *  $Revision: 1.2 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/Cantera/src/oneD/Resid1D.h b/Cantera/src/oneD/Resid1D.h
index 34dcda18e..58f089ba7 100644
--- a/Cantera/src/oneD/Resid1D.h
+++ b/Cantera/src/oneD/Resid1D.h
@@ -1,9 +1,9 @@
 /**
  *  @file Resid1D.h
  *
- *  $Author: dggoodwin $
- *  $Date: 2006/11/27 21:43:34 $
- *  $Revision: 1.4 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/Cantera/src/oneD/Solid1D.cpp b/Cantera/src/oneD/Solid1D.cpp
index c9797b7fa..4f6be4b61 100644
--- a/Cantera/src/oneD/Solid1D.cpp
+++ b/Cantera/src/oneD/Solid1D.cpp
@@ -3,9 +3,9 @@
  */
 
 /*
- * $Author: dggoodwin $
- * $Revision: 1.4 $
- * $Date: 2004/08/28 16:12:41 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2003  California Institute of Technology
diff --git a/Cantera/src/oneD/Solid1D.h b/Cantera/src/oneD/Solid1D.h
index 70c4cf64f..c0f32964f 100644
--- a/Cantera/src/oneD/Solid1D.h
+++ b/Cantera/src/oneD/Solid1D.h
@@ -4,9 +4,9 @@
  */
 
 /*
- * $Author: dggoodwin $
- * $Revision: 1.3 $
- * $Date: 2006/11/27 21:43:34 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/oneD/StFlow.cpp b/Cantera/src/oneD/StFlow.cpp
index 29fc73328..16d39d5c4 100644
--- a/Cantera/src/oneD/StFlow.cpp
+++ b/Cantera/src/oneD/StFlow.cpp
@@ -3,9 +3,9 @@
  */
 
 /*
- * $Author: dggoodwin $
- * $Revision: 1.32 $
- * $Date: 2007/05/04 14:41:27 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2002  California Institute of Technology
diff --git a/Cantera/src/oneD/StFlow.h b/Cantera/src/oneD/StFlow.h
index ffab5c402..83437325d 100644
--- a/Cantera/src/oneD/StFlow.h
+++ b/Cantera/src/oneD/StFlow.h
@@ -4,9 +4,9 @@
  */
 
 /*
- * $Author: dggoodwin $
- * $Revision: 1.18 $
- * $Date: 2007/05/22 20:16:47 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/oneD/boundaries1D.cpp b/Cantera/src/oneD/boundaries1D.cpp
index 678f07f6f..d788cf99d 100644
--- a/Cantera/src/oneD/boundaries1D.cpp
+++ b/Cantera/src/oneD/boundaries1D.cpp
@@ -3,9 +3,9 @@
  */
 
 /*
- * $Author: dggoodwin $
- * $Revision: 1.18 $
- * $Date: 2006/11/27 21:43:34 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2002-3  California Institute of Technology
diff --git a/Cantera/src/spectra/Makefile.in b/Cantera/src/spectra/Makefile.in
index e612622e9..fc124f288 100644
--- a/Cantera/src/spectra/Makefile.in
+++ b/Cantera/src/spectra/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2009/04/04 03:08:28 $
-#  $Revision: 1.7 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2007 California Institute of Technology
 #
diff --git a/Cantera/src/thermo/AdsorbateThermo.h b/Cantera/src/thermo/AdsorbateThermo.h
index 88457697e..1d8230ffd 100644
--- a/Cantera/src/thermo/AdsorbateThermo.h
+++ b/Cantera/src/thermo/AdsorbateThermo.h
@@ -8,9 +8,9 @@
  *
  */
 
-/* $Author: dggoodwin $
- * $Revision: 1.2 $
- * $Date: 2007/12/24 15:32:30 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2007  California Institute of Technology
diff --git a/Cantera/src/thermo/ConstCpPoly.cpp b/Cantera/src/thermo/ConstCpPoly.cpp
index 868fafea9..2cfcd2a37 100644
--- a/Cantera/src/thermo/ConstCpPoly.cpp
+++ b/Cantera/src/thermo/ConstCpPoly.cpp
@@ -5,9 +5,9 @@
  * \link Cantera::ConstCpPoly ConstCpPoly \endlink).
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.3 $
- * $Date: 2008/12/17 17:04:46 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/thermo/ConstCpPoly.h b/Cantera/src/thermo/ConstCpPoly.h
index b46ccd8bb..7577769c5 100644
--- a/Cantera/src/thermo/ConstCpPoly.h
+++ b/Cantera/src/thermo/ConstCpPoly.h
@@ -5,9 +5,9 @@
  * \link Cantera::ConstCpPoly ConstCpPoly\endlink).
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.3 $
- * $Date: 2008/12/13 01:59:49 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 // Copyright 2001  California Institute of Technology
 
diff --git a/Cantera/src/thermo/ConstDensityThermo.cpp b/Cantera/src/thermo/ConstDensityThermo.cpp
index a8d442957..b0adfaca1 100644
--- a/Cantera/src/thermo/ConstDensityThermo.cpp
+++ b/Cantera/src/thermo/ConstDensityThermo.cpp
@@ -5,7 +5,7 @@
 \endlink).
  */
 /*
- * $Id: ConstDensityThermo.cpp,v 1.5 2008/12/17 17:04:47 hkmoffa Exp $
+ * $Id$
  *
  *  Copyright 2002 California Institute of Technology
  */
diff --git a/Cantera/src/thermo/ConstDensityThermo.h b/Cantera/src/thermo/ConstDensityThermo.h
index 809323156..f462516c5 100644
--- a/Cantera/src/thermo/ConstDensityThermo.h
+++ b/Cantera/src/thermo/ConstDensityThermo.h
@@ -4,9 +4,9 @@
  * (see \ref thermoprops and \link Cantera::ConstDensityThermo ConstDensityThermo\endlink).
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/10 16:42:48 $
- *  $Revision: 1.5 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/Cantera/src/thermo/Constituents.cpp b/Cantera/src/thermo/Constituents.cpp
index 54a9e220f..2d42d9564 100644
--- a/Cantera/src/thermo/Constituents.cpp
+++ b/Cantera/src/thermo/Constituents.cpp
@@ -5,8 +5,8 @@
  */
 
 /* 
- *  $Date: 2009/01/04 21:28:02 $
- *  $Revision: 1.7 $
+ *  $Date$
+ *  $Revision$
  */
 
 //  Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/thermo/Constituents.h b/Cantera/src/thermo/Constituents.h
index e386ee935..a38622906 100644
--- a/Cantera/src/thermo/Constituents.h
+++ b/Cantera/src/thermo/Constituents.h
@@ -5,8 +5,8 @@
  */
 
 /*  
- *  $Date: 2009/02/23 20:41:03 $
- *  $Revision: 1.7 $
+ *  $Date$
+ *  $Revision$
  */
 
 //  Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/thermo/Crystal.h b/Cantera/src/thermo/Crystal.h
index efe4a8c3b..3e6652137 100644
--- a/Cantera/src/thermo/Crystal.h
+++ b/Cantera/src/thermo/Crystal.h
@@ -1,9 +1,9 @@
 /**
  * @file Crystal.h
  *
- *  $Author: dggoodwin $
- *  $Date: 2007/05/04 14:02:40 $
- *  $Revision: 1.1 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 #ifndef CT_CRYSTAL_H
 #define CT_CRYSTAL_H
diff --git a/Cantera/src/thermo/DebyeHuckel.cpp b/Cantera/src/thermo/DebyeHuckel.cpp
index 9c4d78919..91546cf6d 100644
--- a/Cantera/src/thermo/DebyeHuckel.cpp
+++ b/Cantera/src/thermo/DebyeHuckel.cpp
@@ -13,7 +13,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: DebyeHuckel.cpp,v 1.33 2009/03/27 00:38:56 hkmoffa Exp $
+ * $Id$
  */
 //! Max function
 #ifndef MAX
diff --git a/Cantera/src/thermo/DebyeHuckel.h b/Cantera/src/thermo/DebyeHuckel.h
index 1467ec860..16e3b5dc8 100644
--- a/Cantera/src/thermo/DebyeHuckel.h
+++ b/Cantera/src/thermo/DebyeHuckel.h
@@ -15,7 +15,7 @@
  */
 
 /*
- * $Id: DebyeHuckel.h,v 1.31 2009/03/27 00:38:57 hkmoffa Exp $
+ * $Id$
  */
 
 #ifndef CT_DEBYEHUCKEL_H
diff --git a/Cantera/src/thermo/EdgePhase.h b/Cantera/src/thermo/EdgePhase.h
index 8acafc6bf..176e9afb8 100644
--- a/Cantera/src/thermo/EdgePhase.h
+++ b/Cantera/src/thermo/EdgePhase.h
@@ -4,9 +4,9 @@
  *       between two surfaces (see \ref thermoprops and \link Cantera::EdgePhase EdgePhase\endlink).
  */
 
-/*  $Author: hkmoffa $
- *  $Date: 2008/10/08 22:11:08 $
- *  $Revision: 1.3 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/Cantera/src/thermo/Elements.cpp b/Cantera/src/thermo/Elements.cpp
index 073e3c443..61e4a260b 100644
--- a/Cantera/src/thermo/Elements.cpp
+++ b/Cantera/src/thermo/Elements.cpp
@@ -9,9 +9,9 @@
 
 /****************************************************************************
  *  $RCSfile: Elements.cpp,v $
- *  $Author: hkmoffa $
- *  $Date: 2009/03/13 03:21:34 $
- *  $Revision: 1.7 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *
  ****************************************************************************/
diff --git a/Cantera/src/thermo/Elements.h b/Cantera/src/thermo/Elements.h
index 298450eb3..148cf2abf 100644
--- a/Cantera/src/thermo/Elements.h
+++ b/Cantera/src/thermo/Elements.h
@@ -7,9 +7,9 @@
  */
 /***********************************************************************
  *  $RCSfile: Elements.h,v $
- *  $Author: hkmoffa $ 
- *  $Date: 2008/12/04 02:02:45 $
- *  $Revision: 1.5 $
+ *  $Author$ 
+ *  $Date$
+ *  $Revision$
  ***********************************************************************/
 //  Copyright 2001  California Institute of Technology
 
diff --git a/Cantera/src/thermo/GeneralSpeciesThermo.cpp b/Cantera/src/thermo/GeneralSpeciesThermo.cpp
index 683ae3c74..b96fd7bbe 100644
--- a/Cantera/src/thermo/GeneralSpeciesThermo.cpp
+++ b/Cantera/src/thermo/GeneralSpeciesThermo.cpp
@@ -5,7 +5,7 @@
  * \link Cantera::GeneralSpeciesThermo GeneralSpeciesThermo\endlink).
  */
 /*
- * $Id: GeneralSpeciesThermo.cpp,v 1.10 2008/12/13 01:59:49 hkmoffa Exp $
+ * $Id$
  */
 // Copyright 2001-2004  California Institute of Technology
                 
diff --git a/Cantera/src/thermo/GeneralSpeciesThermo.h b/Cantera/src/thermo/GeneralSpeciesThermo.h
index 4cbe211f3..0697d7e9d 100644
--- a/Cantera/src/thermo/GeneralSpeciesThermo.h
+++ b/Cantera/src/thermo/GeneralSpeciesThermo.h
@@ -8,9 +8,9 @@
  */
 
 /*
- * $Author: hkmoffa $
- * $Revision: 1.7 $
- * $Date: 2008/12/13 01:59:49 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 #ifndef CT_GENERALSPECIESTHERMO_H
diff --git a/Cantera/src/thermo/GibbsExcessVPSSTP.cpp b/Cantera/src/thermo/GibbsExcessVPSSTP.cpp
index 4019c3886..e45bd5243 100644
--- a/Cantera/src/thermo/GibbsExcessVPSSTP.cpp
+++ b/Cantera/src/thermo/GibbsExcessVPSSTP.cpp
@@ -17,8 +17,8 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Date: 2009/03/03 21:08:31 $
- *  $Revision: 1.3 $
+ *  $Date$
+ *  $Revision$
  */
 
 
diff --git a/Cantera/src/thermo/GibbsExcessVPSSTP.h b/Cantera/src/thermo/GibbsExcessVPSSTP.h
index c9d27094f..59b456232 100644
--- a/Cantera/src/thermo/GibbsExcessVPSSTP.h
+++ b/Cantera/src/thermo/GibbsExcessVPSSTP.h
@@ -17,7 +17,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Id: GibbsExcessVPSSTP.h,v 1.3 2009/03/03 21:08:31 hkmoffa Exp $
+ *  $Id$
  */
 
 #ifndef CT_GIBBSEXCESSVPSSTP_H
diff --git a/Cantera/src/thermo/HMWSoln.cpp b/Cantera/src/thermo/HMWSoln.cpp
index c221ab0cf..073eeaddf 100644
--- a/Cantera/src/thermo/HMWSoln.cpp
+++ b/Cantera/src/thermo/HMWSoln.cpp
@@ -18,7 +18,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: HMWSoln.cpp,v 1.53 2009/03/27 00:38:57 hkmoffa Exp $
+ * $Id$
  */
 //@{
 #ifndef MAX
diff --git a/Cantera/src/thermo/HMWSoln.h b/Cantera/src/thermo/HMWSoln.h
index 7b146f554..40cce6f86 100644
--- a/Cantera/src/thermo/HMWSoln.h
+++ b/Cantera/src/thermo/HMWSoln.h
@@ -14,7 +14,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Id: HMWSoln.h,v 1.62 2009/03/27 00:38:57 hkmoffa Exp $
+ *  $Id$
  */
 
 #ifndef CT_HMWSOLN_H
diff --git a/Cantera/src/thermo/HMWSoln_input.cpp b/Cantera/src/thermo/HMWSoln_input.cpp
index 534684626..bca1ae93f 100644
--- a/Cantera/src/thermo/HMWSoln_input.cpp
+++ b/Cantera/src/thermo/HMWSoln_input.cpp
@@ -13,7 +13,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: HMWSoln_input.cpp,v 1.33 2009/01/29 02:07:05 hkmoffa Exp $
+ * $Id$
  */
 
 #include "HMWSoln.h"
diff --git a/Cantera/src/thermo/IdealGasPhase.cpp b/Cantera/src/thermo/IdealGasPhase.cpp
index a07107628..b442f540b 100644
--- a/Cantera/src/thermo/IdealGasPhase.cpp
+++ b/Cantera/src/thermo/IdealGasPhase.cpp
@@ -7,7 +7,7 @@
  *
  */
 /*
- * $Id: IdealGasPhase.cpp,v 1.3 2008/08/23 00:53:54 hkmoffa Exp $
+ * $Id$
  */
 
 #ifdef WIN32
diff --git a/Cantera/src/thermo/IdealGasPhase.h b/Cantera/src/thermo/IdealGasPhase.h
index c9d069943..cc676a8a4 100644
--- a/Cantera/src/thermo/IdealGasPhase.h
+++ b/Cantera/src/thermo/IdealGasPhase.h
@@ -6,9 +6,9 @@
  * 
  */
 
-/*  $Author: hkmoffa $
- *  $Date: 2009/07/05 18:07:18 $
- *  $Revision: 1.5 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001 California Institute of Technology
  *
diff --git a/Cantera/src/thermo/IdealMolalSoln.cpp b/Cantera/src/thermo/IdealMolalSoln.cpp
index 280e0060a..0c560636a 100644
--- a/Cantera/src/thermo/IdealMolalSoln.cpp
+++ b/Cantera/src/thermo/IdealMolalSoln.cpp
@@ -19,8 +19,8 @@
  */
 /*
  *
- *  $Date: 2009/03/27 00:51:38 $
- *  $Revision: 1.27 $
+ *  $Date$
+ *  $Revision$
  */
 
 #include "IdealMolalSoln.h"
diff --git a/Cantera/src/thermo/IdealMolalSoln.h b/Cantera/src/thermo/IdealMolalSoln.h
index 4a5118762..737fe349a 100644
--- a/Cantera/src/thermo/IdealMolalSoln.h
+++ b/Cantera/src/thermo/IdealMolalSoln.h
@@ -19,9 +19,9 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2009/03/27 00:51:38 $
- *  $Revision: 1.24 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #ifndef CT_IDEALMOLALSOLN_H
diff --git a/Cantera/src/thermo/IdealSolidSolnPhase.cpp b/Cantera/src/thermo/IdealSolidSolnPhase.cpp
index 5ca849645..ccc8aa17b 100644
--- a/Cantera/src/thermo/IdealSolidSolnPhase.cpp
+++ b/Cantera/src/thermo/IdealSolidSolnPhase.cpp
@@ -5,7 +5,7 @@
  *      \link Cantera::IdealSolidSolnPhase IdealSolidSolnPhase\endlink).
  */
 /*
- * $Id: IdealSolidSolnPhase.cpp,v 1.11 2009/03/27 00:51:39 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite 2006 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/thermo/IdealSolidSolnPhase.h b/Cantera/src/thermo/IdealSolidSolnPhase.h
index 77df55a8d..a9f87b29c 100644
--- a/Cantera/src/thermo/IdealSolidSolnPhase.h
+++ b/Cantera/src/thermo/IdealSolidSolnPhase.h
@@ -10,9 +10,9 @@
  */
 
 /* 
- * $Author: hkmoffa $
- *  $Date: 2009/03/27 00:51:39 $
- *  $Revision: 1.18 $
+ * $Author$
+ *  $Date$
+ *  $Revision$
  */
 /*
  * Copywrite 2006 Sandia Corporation. Under the terms of Contract
diff --git a/Cantera/src/thermo/IdealSolnGasVPSS.cpp b/Cantera/src/thermo/IdealSolnGasVPSS.cpp
index 308d5f612..a3943247b 100644
--- a/Cantera/src/thermo/IdealSolnGasVPSS.cpp
+++ b/Cantera/src/thermo/IdealSolnGasVPSS.cpp
@@ -12,9 +12,9 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/09/16 14:38:13 $
- *  $Revision: 1.2 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 // turn off warnings under Windows
diff --git a/Cantera/src/thermo/IdealSolnGasVPSS.h b/Cantera/src/thermo/IdealSolnGasVPSS.h
index be8623de0..4be4e7a09 100644
--- a/Cantera/src/thermo/IdealSolnGasVPSS.h
+++ b/Cantera/src/thermo/IdealSolnGasVPSS.h
@@ -12,9 +12,9 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/08/23 00:53:54 $
- *  $Revision: 1.1 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #ifndef CT_IDEALSOLNGASVPSS_H
diff --git a/Cantera/src/thermo/IonsFromNeutralVPSSTP.cpp b/Cantera/src/thermo/IonsFromNeutralVPSSTP.cpp
index bf39f3397..d848b7f97 100644
--- a/Cantera/src/thermo/IonsFromNeutralVPSSTP.cpp
+++ b/Cantera/src/thermo/IonsFromNeutralVPSSTP.cpp
@@ -17,8 +17,8 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Date: 2009/03/27 01:08:55 $
- *  $Revision: 1.2 $
+ *  $Date$
+ *  $Revision$
  */
 
 #include "IonsFromNeutralVPSSTP.h"
diff --git a/Cantera/src/thermo/IonsFromNeutralVPSSTP.h b/Cantera/src/thermo/IonsFromNeutralVPSSTP.h
index 66da9ddf0..955c88694 100644
--- a/Cantera/src/thermo/IonsFromNeutralVPSSTP.h
+++ b/Cantera/src/thermo/IonsFromNeutralVPSSTP.h
@@ -17,7 +17,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Id: $
+ *  $Id$
  */
 
 #ifndef CT_IONSFROMNEUTRALVPSSTP_H
diff --git a/Cantera/src/thermo/LatticePhase.cpp b/Cantera/src/thermo/LatticePhase.cpp
index 46a951e9c..00942edfb 100644
--- a/Cantera/src/thermo/LatticePhase.cpp
+++ b/Cantera/src/thermo/LatticePhase.cpp
@@ -8,7 +8,7 @@
  *
  */
 /*
- * $Id: LatticePhase.cpp,v 1.8 2009/01/02 22:34:41 hkmoffa Exp $
+ * $Id$
  */
 
 #include "config.h"
diff --git a/Cantera/src/thermo/LatticePhase.h b/Cantera/src/thermo/LatticePhase.h
index 465d28187..7c160560c 100644
--- a/Cantera/src/thermo/LatticePhase.h
+++ b/Cantera/src/thermo/LatticePhase.h
@@ -6,9 +6,9 @@
  *  (see \ref thermoprops and class \link Cantera::LatticePhase LatticePhase\endlink).
  *
  */
-/*  $Author: hkmoffa $
- *  $Date: 2008/12/13 01:59:49 $
- *  $Revision: 1.7 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2005 California Institute of Technology
  *
diff --git a/Cantera/src/thermo/LatticeSolidPhase.cpp b/Cantera/src/thermo/LatticeSolidPhase.cpp
index e0e13dddf..e9671db02 100644
--- a/Cantera/src/thermo/LatticeSolidPhase.cpp
+++ b/Cantera/src/thermo/LatticeSolidPhase.cpp
@@ -2,7 +2,7 @@
  *
  *  @file LatticeSolidPhase.cpp
  *
- * $Id: LatticeSolidPhase.cpp,v 1.4 2008/10/08 22:11:08 hkmoffa Exp $
+ * $Id$
  */
 
 #ifdef WIN32
diff --git a/Cantera/src/thermo/LatticeSolidPhase.h b/Cantera/src/thermo/LatticeSolidPhase.h
index 8f765e894..d97116f3b 100644
--- a/Cantera/src/thermo/LatticeSolidPhase.h
+++ b/Cantera/src/thermo/LatticeSolidPhase.h
@@ -7,9 +7,9 @@
 
  */
 
-/*  $Author: hkmoffa $
- *  $Date: 2008/12/13 01:59:49 $
- *  $Revision: 1.5 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2005 California Institute of Technology
  *
diff --git a/Cantera/src/thermo/Makefile.in b/Cantera/src/thermo/Makefile.in
index fee9e7dfc..b45d3eb44 100644
--- a/Cantera/src/thermo/Makefile.in
+++ b/Cantera/src/thermo/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2009/03/03 21:08:31 $
-#  $Revision: 1.30 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2002 California Institute of Technology
 #
diff --git a/Cantera/src/thermo/MargulesVPSSTP.cpp b/Cantera/src/thermo/MargulesVPSSTP.cpp
index c19956c1b..d2f6ebdce 100644
--- a/Cantera/src/thermo/MargulesVPSSTP.cpp
+++ b/Cantera/src/thermo/MargulesVPSSTP.cpp
@@ -12,8 +12,8 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Date: 2009/03/03 21:08:31 $
- *  $Revision: 1.1 $
+ *  $Date$
+ *  $Revision$
  */
 
 
diff --git a/Cantera/src/thermo/MetalPhase.h b/Cantera/src/thermo/MetalPhase.h
index 3d4163252..32ad3431d 100644
--- a/Cantera/src/thermo/MetalPhase.h
+++ b/Cantera/src/thermo/MetalPhase.h
@@ -4,9 +4,9 @@
  *
  */
 
-/*  $Author: hkmoffa $
- *  $Date: 2009/03/24 20:36:05 $
- *  $Revision: 1.4 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2003 California Institute of Technology
  *
diff --git a/Cantera/src/thermo/MineralEQ3.cpp b/Cantera/src/thermo/MineralEQ3.cpp
index 849d03e32..1758f95de 100644
--- a/Cantera/src/thermo/MineralEQ3.cpp
+++ b/Cantera/src/thermo/MineralEQ3.cpp
@@ -14,7 +14,7 @@
  */
 
 /*
- * $Id: MineralEQ3.cpp,v 1.2 2008/12/27 00:27:55 hkmoffa Exp $ 
+ * $Id$ 
  */
 
 #include "ct_defs.h"
diff --git a/Cantera/src/thermo/MineralEQ3.h b/Cantera/src/thermo/MineralEQ3.h
index 83077d219..f75f28a9e 100644
--- a/Cantera/src/thermo/MineralEQ3.h
+++ b/Cantera/src/thermo/MineralEQ3.h
@@ -14,8 +14,8 @@
  */
 
 /* 
- *  $Date: 2009/01/04 19:21:28 $
- *  $Revision: 1.4 $
+ *  $Date$
+ *  $Revision$
  */
 
 #ifndef CT_MINERALEQ3_H
diff --git a/Cantera/src/thermo/MolalityVPSSTP.cpp b/Cantera/src/thermo/MolalityVPSSTP.cpp
index c526ebcce..285289a9e 100644
--- a/Cantera/src/thermo/MolalityVPSSTP.cpp
+++ b/Cantera/src/thermo/MolalityVPSSTP.cpp
@@ -17,9 +17,9 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2009/01/16 16:24:35 $
- *  $Revision: 1.23 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 
diff --git a/Cantera/src/thermo/MolalityVPSSTP.h b/Cantera/src/thermo/MolalityVPSSTP.h
index a635e3091..f9eb439d9 100644
--- a/Cantera/src/thermo/MolalityVPSSTP.h
+++ b/Cantera/src/thermo/MolalityVPSSTP.h
@@ -17,7 +17,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Id: MolalityVPSSTP.h,v 1.20 2009/01/20 21:48:54 hkmoffa Exp $
+ *  $Id$
  */
 
 #ifndef CT_MOLALITYVPSSTP_H
diff --git a/Cantera/src/thermo/Mu0Poly.cpp b/Cantera/src/thermo/Mu0Poly.cpp
index 59cf05441..81cfc3333 100644
--- a/Cantera/src/thermo/Mu0Poly.cpp
+++ b/Cantera/src/thermo/Mu0Poly.cpp
@@ -6,9 +6,9 @@
  *  (see \ref spthermo and class \link Cantera::Mu0Poly Mu0Poly\endlink).
  */
 /*
- * $Author: dggoodwin $
- * $Revision: 1.1 $
- * $Date: 2007/05/04 14:02:42 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 
diff --git a/Cantera/src/thermo/Mu0Poly.h b/Cantera/src/thermo/Mu0Poly.h
index ad926486f..b3eee75ba 100644
--- a/Cantera/src/thermo/Mu0Poly.h
+++ b/Cantera/src/thermo/Mu0Poly.h
@@ -6,9 +6,9 @@
  *  (see \ref spthermo and class \link Cantera::Mu0Poly Mu0Poly\endlink).
  */
 
-/* $Author: hkmoffa $
- * $Revision: 1.2 $
- * $Date: 2007/09/13 15:05:39 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 
 
diff --git a/Cantera/src/thermo/Nasa9Poly1.cpp b/Cantera/src/thermo/Nasa9Poly1.cpp
index dc22c741a..61ecd735f 100644
--- a/Cantera/src/thermo/Nasa9Poly1.cpp
+++ b/Cantera/src/thermo/Nasa9Poly1.cpp
@@ -10,9 +10,9 @@
  *  This parameterization has one NASA temperature region.
  */
 
-/* $Author: hkmoffa $
- * $Revision: 1.4 $
- * $Date: 2007/12/27 19:09:38 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 // Copyright 2007  Sandia National Laboratories
 
diff --git a/Cantera/src/thermo/Nasa9Poly1.h b/Cantera/src/thermo/Nasa9Poly1.h
index b3447851c..2b8bd5244 100644
--- a/Cantera/src/thermo/Nasa9Poly1.h
+++ b/Cantera/src/thermo/Nasa9Poly1.h
@@ -19,8 +19,8 @@
 #define CT_NASA9POLY1_H
 
 /* 
- * $Revision: 1.4 $
- * $Date: 2009/01/04 19:21:28 $
+ * $Revision$
+ * $Date$
  */
 
 
diff --git a/Cantera/src/thermo/Nasa9PolyMultiTempRegion.cpp b/Cantera/src/thermo/Nasa9PolyMultiTempRegion.cpp
index 4de34c16f..47c5788e0 100644
--- a/Cantera/src/thermo/Nasa9PolyMultiTempRegion.cpp
+++ b/Cantera/src/thermo/Nasa9PolyMultiTempRegion.cpp
@@ -11,9 +11,9 @@
  *  This parameterization has one NASA temperature region.
  */
 
-/* $Author: hkmoffa $
- * $Revision: 1.5 $
- * $Date: 2008/03/04 23:40:18 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 // Copyright 2007  Sandia National Laboratories
 
diff --git a/Cantera/src/thermo/Nasa9PolyMultiTempRegion.h b/Cantera/src/thermo/Nasa9PolyMultiTempRegion.h
index b24e83cc9..b29d138f5 100644
--- a/Cantera/src/thermo/Nasa9PolyMultiTempRegion.h
+++ b/Cantera/src/thermo/Nasa9PolyMultiTempRegion.h
@@ -14,9 +14,9 @@
 #ifndef CT_NASA9POLYMULTITEMPREGION_H
 #define CT_NASA9POLYMULTITEMPREGION_H
 
-/* $Author: hkmoffa $
- * $Revision: 1.3 $
- * $Date: 2007/12/27 19:09:38 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2007  Sandia National Laboratories
diff --git a/Cantera/src/thermo/NasaPoly1.h b/Cantera/src/thermo/NasaPoly1.h
index 17df3a245..60736ecca 100644
--- a/Cantera/src/thermo/NasaPoly1.h
+++ b/Cantera/src/thermo/NasaPoly1.h
@@ -14,9 +14,9 @@
 #define CT_NASAPOLY1_H
 
 
-/* $Author: hkmoffa $
- * $Revision: 1.3 $
- * $Date: 2008/12/13 01:59:49 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/thermo/NasaPoly2.h b/Cantera/src/thermo/NasaPoly2.h
index 0c542abf9..3e885f561 100644
--- a/Cantera/src/thermo/NasaPoly2.h
+++ b/Cantera/src/thermo/NasaPoly2.h
@@ -8,9 +8,9 @@
  *  Two zoned Nasa polynomial parameterization
  */
 
-/* $Author: hkmoffa $
- * $Revision: 1.3 $
- * $Date: 2008/12/13 01:59:49 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/thermo/NasaThermo.h b/Cantera/src/thermo/NasaThermo.h
index 438a6a71b..46cf02a71 100644
--- a/Cantera/src/thermo/NasaThermo.h
+++ b/Cantera/src/thermo/NasaThermo.h
@@ -7,8 +7,8 @@
  */
 
 /*
- * $Revision: 1.7 $
- * $Date: 2009/01/04 19:21:28 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2003 California Institute of Technology
diff --git a/Cantera/src/thermo/PDSS.cpp b/Cantera/src/thermo/PDSS.cpp
index 64a5301b7..8409882fe 100644
--- a/Cantera/src/thermo/PDSS.cpp
+++ b/Cantera/src/thermo/PDSS.cpp
@@ -10,7 +10,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: PDSS.cpp,v 1.17 2009/01/04 06:34:19 hkmoffa Exp $
+ * $Id$
  */
 
 #include "ct_defs.h"
diff --git a/Cantera/src/thermo/PDSS.h b/Cantera/src/thermo/PDSS.h
index ad989cfe8..0ca22eb30 100644
--- a/Cantera/src/thermo/PDSS.h
+++ b/Cantera/src/thermo/PDSS.h
@@ -10,7 +10,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Id: PDSS.h,v 1.16 2009/01/04 19:21:28 hkmoffa Exp $
+ *  $Id$
  */
 
 #ifndef CT_PDSS_H
diff --git a/Cantera/src/thermo/PDSSFactory.cpp b/Cantera/src/thermo/PDSSFactory.cpp
index b8e87c564..b1c27f784 100644
--- a/Cantera/src/thermo/PDSSFactory.cpp
+++ b/Cantera/src/thermo/PDSSFactory.cpp
@@ -5,7 +5,7 @@
  *    (see \ref pdssthermo and class \link Cantera::SpeciesThermoFactory SpeciesThermoFactory\endlink);
  */
 /*
- * $Id: PDSSFactory.cpp,v 1.2 2008/10/13 21:01:48 hkmoffa Exp $
+ * $Id$
  */
 // Copyright 2001  California Institute of Technology
 
diff --git a/Cantera/src/thermo/PDSS_ConstVol.cpp b/Cantera/src/thermo/PDSS_ConstVol.cpp
index 557be556f..5eff50510 100644
--- a/Cantera/src/thermo/PDSS_ConstVol.cpp
+++ b/Cantera/src/thermo/PDSS_ConstVol.cpp
@@ -9,7 +9,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: PDSS_ConstVol.cpp,v 1.10 2009/01/04 06:34:20 hkmoffa Exp $
+ * $Id$
  */
 
 #include "ct_defs.h"
diff --git a/Cantera/src/thermo/PDSS_ConstVol.h b/Cantera/src/thermo/PDSS_ConstVol.h
index eaea66322..87815b047 100644
--- a/Cantera/src/thermo/PDSS_ConstVol.h
+++ b/Cantera/src/thermo/PDSS_ConstVol.h
@@ -10,7 +10,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Id: PDSS_ConstVol.h,v 1.6 2008/10/13 21:01:48 hkmoffa Exp $
+ *  $Id$
  */
 
 #ifndef CT_PDSS_CONSTVOL_H
diff --git a/Cantera/src/thermo/PDSS_HKFT.cpp b/Cantera/src/thermo/PDSS_HKFT.cpp
index b78dc22bf..313e140d3 100644
--- a/Cantera/src/thermo/PDSS_HKFT.cpp
+++ b/Cantera/src/thermo/PDSS_HKFT.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * $Id: PDSS_HKFT.cpp,v 1.22 2009/03/13 03:21:34 hkmoffa Exp $
+ * $Id$
  */
 
 /*
diff --git a/Cantera/src/thermo/PDSS_HKFT.h b/Cantera/src/thermo/PDSS_HKFT.h
index 987005f72..99202cf7b 100644
--- a/Cantera/src/thermo/PDSS_HKFT.h
+++ b/Cantera/src/thermo/PDSS_HKFT.h
@@ -7,8 +7,8 @@
  */
 
 /* 
- *  $Date: 2009/01/04 19:21:28 $
- *  $Revision: 1.14 $
+ *  $Date$
+ *  $Revision$
  */
 
 /*
diff --git a/Cantera/src/thermo/PDSS_IdealGas.cpp b/Cantera/src/thermo/PDSS_IdealGas.cpp
index b34376aa3..48be63302 100644
--- a/Cantera/src/thermo/PDSS_IdealGas.cpp
+++ b/Cantera/src/thermo/PDSS_IdealGas.cpp
@@ -9,7 +9,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: PDSS_IdealGas.cpp,v 1.8 2009/01/04 06:34:20 hkmoffa Exp $
+ * $Id$
  */
 
 #include "ct_defs.h"
diff --git a/Cantera/src/thermo/PDSS_IdealGas.h b/Cantera/src/thermo/PDSS_IdealGas.h
index 909581ec0..5c2ae566d 100644
--- a/Cantera/src/thermo/PDSS_IdealGas.h
+++ b/Cantera/src/thermo/PDSS_IdealGas.h
@@ -10,7 +10,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Id: PDSS_IdealGas.h,v 1.4 2008/10/13 21:01:48 hkmoffa Exp $
+ *  $Id$
  */
 
 #ifndef CT_PDSS_IDEALGAS_H
diff --git a/Cantera/src/thermo/PDSS_IonsFromNeutral.cpp b/Cantera/src/thermo/PDSS_IonsFromNeutral.cpp
index 1c598b04a..f768a4e89 100644
--- a/Cantera/src/thermo/PDSS_IonsFromNeutral.cpp
+++ b/Cantera/src/thermo/PDSS_IonsFromNeutral.cpp
@@ -9,7 +9,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: PDSS_IonsFromNeutral.cpp,v 1.8 2009/01/04 06:34:20 hkmoffa Exp $
+ * $Id$
  */
 
 #include "ct_defs.h"
diff --git a/Cantera/src/thermo/PDSS_IonsFromNeutral.h b/Cantera/src/thermo/PDSS_IonsFromNeutral.h
index 7399c6953..58d963a15 100644
--- a/Cantera/src/thermo/PDSS_IonsFromNeutral.h
+++ b/Cantera/src/thermo/PDSS_IonsFromNeutral.h
@@ -11,7 +11,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Id: PDSS_IdealGas.h,v 1.4 2008/10/13 21:01:48 hkmoffa Exp $
+ *  $Id$
  */
 
 #ifndef CT_PDSS_IONSFROMNEUTRAL_H
diff --git a/Cantera/src/thermo/PDSS_SSVol.cpp b/Cantera/src/thermo/PDSS_SSVol.cpp
index 21ec884a6..c99a1a537 100644
--- a/Cantera/src/thermo/PDSS_SSVol.cpp
+++ b/Cantera/src/thermo/PDSS_SSVol.cpp
@@ -9,7 +9,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: PDSS_SSVol.cpp,v 1.10 2009/01/04 06:34:20 hkmoffa Exp $
+ * $Id$
  */
 
 #include "ct_defs.h"
diff --git a/Cantera/src/thermo/PDSS_SSVol.h b/Cantera/src/thermo/PDSS_SSVol.h
index 16dba893b..a2755fbf0 100644
--- a/Cantera/src/thermo/PDSS_SSVol.h
+++ b/Cantera/src/thermo/PDSS_SSVol.h
@@ -11,7 +11,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Id: PDSS_SSVol.h,v 1.6 2008/10/13 21:01:48 hkmoffa Exp $
+ *  $Id$
  */
 
 #ifndef CT_PDSS_SSVOL_H
diff --git a/Cantera/src/thermo/PDSS_Water.cpp b/Cantera/src/thermo/PDSS_Water.cpp
index 50beffd50..9a6170521 100644
--- a/Cantera/src/thermo/PDSS_Water.cpp
+++ b/Cantera/src/thermo/PDSS_Water.cpp
@@ -8,7 +8,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: PDSS_Water.cpp,v 1.15 2008/12/22 22:40:44 hkmoffa Exp $
+ * $Id$
  */
 #include "ct_defs.h"
 
diff --git a/Cantera/src/thermo/PDSS_Water.h b/Cantera/src/thermo/PDSS_Water.h
index 06425eb0b..e01871252 100644
--- a/Cantera/src/thermo/PDSS_Water.h
+++ b/Cantera/src/thermo/PDSS_Water.h
@@ -9,9 +9,9 @@
  * Contract DE-AC04-94AL85000 with Sandia Corporation, the
  * U.S. Government retains certain rights in this software.
  */
-/*  $Author: hkmoffa $
- *  $Date: 2009/01/03 03:59:39 $
- *  $Revision: 1.11 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #ifndef CT_PDSS_WATER_H
diff --git a/Cantera/src/thermo/Phase.h b/Cantera/src/thermo/Phase.h
index 12bdf7e90..8512f8aae 100644
--- a/Cantera/src/thermo/Phase.h
+++ b/Cantera/src/thermo/Phase.h
@@ -8,9 +8,9 @@
  */
 
 /*
- * $Author: hkmoffa $
- * $Revision: 1.5 $
- * $Date: 2008/02/03 20:59:18 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 // Copyright 2001  California Institute of Technology
 
diff --git a/Cantera/src/thermo/PseudoBinaryVPSSTP.cpp b/Cantera/src/thermo/PseudoBinaryVPSSTP.cpp
index 12ee677af..f909098a6 100644
--- a/Cantera/src/thermo/PseudoBinaryVPSSTP.cpp
+++ b/Cantera/src/thermo/PseudoBinaryVPSSTP.cpp
@@ -17,8 +17,8 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Date: 2009/03/27 01:08:55 $
- *  $Revision: 1.2 $
+ *  $Date$
+ *  $Revision$
  */
 
 
diff --git a/Cantera/src/thermo/PseudoBinaryVPSSTP.h b/Cantera/src/thermo/PseudoBinaryVPSSTP.h
index b62053e8c..3cc9a9d5b 100644
--- a/Cantera/src/thermo/PseudoBinaryVPSSTP.h
+++ b/Cantera/src/thermo/PseudoBinaryVPSSTP.h
@@ -17,7 +17,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Id: PseudoBinaryVPSSTP.h,v 1.1 2009/03/03 21:08:31 hkmoffa Exp $
+ *  $Id$
  */
 
 #ifndef CT_PSEUDOBINARYVPSSTP_H
diff --git a/Cantera/src/thermo/PureFluidPhase.cpp b/Cantera/src/thermo/PureFluidPhase.cpp
index 5ce137eee..a0748e18c 100644
--- a/Cantera/src/thermo/PureFluidPhase.cpp
+++ b/Cantera/src/thermo/PureFluidPhase.cpp
@@ -6,7 +6,7 @@
  *   and class \link Cantera::PureFluidPhase PureFluidPhase\endlink).
  */
 /*
- *  $Id: PureFluidPhase.cpp,v 1.5 2009/03/13 03:21:34 hkmoffa Exp $
+ *  $Id$
  */
 #include "xml.h"
 #include "PureFluidPhase.h"
diff --git a/Cantera/src/thermo/PureFluidPhase.h b/Cantera/src/thermo/PureFluidPhase.h
index a1f674f38..2e2c626c1 100644
--- a/Cantera/src/thermo/PureFluidPhase.h
+++ b/Cantera/src/thermo/PureFluidPhase.h
@@ -10,9 +10,9 @@
  * It inherits from ThermoPhase, but is built on top of the tpx package.
  */
 
-/*  $Author: dggoodwin $
- *  $Date: 2007/12/24 15:32:30 $
- *  $Revision: 1.7 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2003 California Institute of Technology
  */
diff --git a/Cantera/src/thermo/SemiconductorPhase.h b/Cantera/src/thermo/SemiconductorPhase.h
index c82fbbd8b..561d7df0b 100644
--- a/Cantera/src/thermo/SemiconductorPhase.h
+++ b/Cantera/src/thermo/SemiconductorPhase.h
@@ -4,9 +4,9 @@
  *
  */
 
-/*  $Author: dggoodwin $
- *  $Date: 2007/11/27 13:26:08 $
- *  $Revision: 1.2 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2003 California Institute of Technology
  *
diff --git a/Cantera/src/thermo/ShomatePoly.h b/Cantera/src/thermo/ShomatePoly.h
index 25745a4aa..2937d8f0b 100644
--- a/Cantera/src/thermo/ShomatePoly.h
+++ b/Cantera/src/thermo/ShomatePoly.h
@@ -8,9 +8,9 @@
  *    Shomate polynomial expressions.
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.3 $
- * $Date: 2008/12/13 01:59:49 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/thermo/ShomateThermo.h b/Cantera/src/thermo/ShomateThermo.h
index 3d7869f2a..c37822801 100644
--- a/Cantera/src/thermo/ShomateThermo.h
+++ b/Cantera/src/thermo/ShomateThermo.h
@@ -6,7 +6,7 @@
  *   \link Cantera::ShomateThermo ShomateThermo\endlink).
  */
 /*
- * $Id: ShomateThermo.h,v 1.6 2008/12/13 01:59:49 hkmoffa Exp $
+ * $Id$
  */
 // Copyright 2001  California Institute of Technology
 
diff --git a/Cantera/src/thermo/SimpleThermo.h b/Cantera/src/thermo/SimpleThermo.h
index c64c8da5e..2a548c739 100644
--- a/Cantera/src/thermo/SimpleThermo.h
+++ b/Cantera/src/thermo/SimpleThermo.h
@@ -6,7 +6,7 @@
  *   \link Cantera::SimpleThermo SimpleThermo\endlink).
  */
 /*
- * $Id: SimpleThermo.h,v 1.9 2008/12/13 01:59:49 hkmoffa Exp $
+ * $Id$
  */
 
 #ifndef CT_SIMPLETHERMO_H
diff --git a/Cantera/src/thermo/SingleSpeciesTP.cpp b/Cantera/src/thermo/SingleSpeciesTP.cpp
index 5b89c2d6b..e9980ada2 100644
--- a/Cantera/src/thermo/SingleSpeciesTP.cpp
+++ b/Cantera/src/thermo/SingleSpeciesTP.cpp
@@ -12,9 +12,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2007/06/05 15:17:15 $
- *  $Revision: 1.10 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #include "SingleSpeciesTP.h"
diff --git a/Cantera/src/thermo/SingleSpeciesTP.h b/Cantera/src/thermo/SingleSpeciesTP.h
index 56ffa94ce..59e726bf2 100644
--- a/Cantera/src/thermo/SingleSpeciesTP.h
+++ b/Cantera/src/thermo/SingleSpeciesTP.h
@@ -13,9 +13,9 @@
 
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/13 01:59:49 $
- *  $Revision: 1.13 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  */
 
diff --git a/Cantera/src/thermo/SpeciesThermo.h b/Cantera/src/thermo/SpeciesThermo.h
index d34cf2ecd..35b8c8edb 100644
--- a/Cantera/src/thermo/SpeciesThermo.h
+++ b/Cantera/src/thermo/SpeciesThermo.h
@@ -6,9 +6,9 @@
  */
 
 /*
- * $Author: hkmoffa $
- * $Revision: 1.10 $
- * $Date: 2008/12/13 01:59:49 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/thermo/SpeciesThermoFactory.cpp b/Cantera/src/thermo/SpeciesThermoFactory.cpp
index 89bea1928..06c48c269 100644
--- a/Cantera/src/thermo/SpeciesThermoFactory.cpp
+++ b/Cantera/src/thermo/SpeciesThermoFactory.cpp
@@ -5,8 +5,8 @@
  *    (see \ref spthermo and class \link Cantera::SpeciesThermoFactory SpeciesThermoFactory\endlink);
  */
 /* 
- * $Revision: 1.20 $
- * $Date: 2008/12/29 21:35:15 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/thermo/SpeciesThermoFactory.h b/Cantera/src/thermo/SpeciesThermoFactory.h
index 7d7af60e7..172b0f939 100644
--- a/Cantera/src/thermo/SpeciesThermoFactory.h
+++ b/Cantera/src/thermo/SpeciesThermoFactory.h
@@ -7,8 +7,8 @@
  */
 
 /*
- * $Revision: 1.11 $
- * $Date: 2009/02/11 20:03:08 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/thermo/SpeciesThermoInterpType.cpp b/Cantera/src/thermo/SpeciesThermoInterpType.cpp
index ce6de7c43..7b7fa5365 100644
--- a/Cantera/src/thermo/SpeciesThermoInterpType.cpp
+++ b/Cantera/src/thermo/SpeciesThermoInterpType.cpp
@@ -3,9 +3,9 @@
  *  Definitions for a 
  */
 
-/* $Author: hkmoffa $
- * $Revision: 1.5 $
- * $Date: 2009/01/04 06:34:20 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 // Copyright 2007  Sandia National Laboratories
 
diff --git a/Cantera/src/thermo/SpeciesThermoInterpType.h b/Cantera/src/thermo/SpeciesThermoInterpType.h
index a1b22903c..6e8f83b04 100644
--- a/Cantera/src/thermo/SpeciesThermoInterpType.h
+++ b/Cantera/src/thermo/SpeciesThermoInterpType.h
@@ -5,9 +5,9 @@
  * (see \ref spthermo and class \link Cantera::SpeciesThermoInterpType SpeciesThermoInterpType \endlink).
  */
  /*
- * $Author: hkmoffa $
- * $Revision: 1.8 $
- * $Date: 2008/12/13 01:59:49 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/thermo/SpeciesThermoMgr.h b/Cantera/src/thermo/SpeciesThermoMgr.h
index 3728dbdb1..14d5347c3 100644
--- a/Cantera/src/thermo/SpeciesThermoMgr.h
+++ b/Cantera/src/thermo/SpeciesThermoMgr.h
@@ -7,9 +7,9 @@
  *   \link Cantera::SpeciesThermoDuo SpeciesThermoDuo\endlink and
  *  \link Cantera::SpeciesThermo1 SpeciesThermo1\endlink)
  *
- * $Author: hkmoffa $
- * $Revision: 1.12 $
- * $Date: 2009/02/11 20:03:08 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/thermo/State.cpp b/Cantera/src/thermo/State.cpp
index d31c4f774..5fcdbbfa8 100644
--- a/Cantera/src/thermo/State.cpp
+++ b/Cantera/src/thermo/State.cpp
@@ -7,8 +7,8 @@
 
 /*
  *  
- *  $Date: 2009/03/03 19:53:34 $
- *  $Revision: 1.8 $
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2003-2004 California Institute of Technology
  *  See file License.txt for licensing information
diff --git a/Cantera/src/thermo/State.h b/Cantera/src/thermo/State.h
index b5bd5eca8..21248e8d3 100644
--- a/Cantera/src/thermo/State.h
+++ b/Cantera/src/thermo/State.h
@@ -6,8 +6,8 @@
  */
 
 /*
- *  $Date: 2009/02/15 17:33:06 $
- *  $Revision: 1.6 $
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001-2003 California Institute of Technology
  *  See file License.txt for licensing information
diff --git a/Cantera/src/thermo/StoichSubstance.cpp b/Cantera/src/thermo/StoichSubstance.cpp
index 964e040aa..7770c149a 100644
--- a/Cantera/src/thermo/StoichSubstance.cpp
+++ b/Cantera/src/thermo/StoichSubstance.cpp
@@ -5,8 +5,8 @@
  *  ThermoPhase class.
  */
 /*
- *  $Date: 2009/01/04 21:28:02 $
- *  $Revision: 1.8 $
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001 California Institute of Technology
  *
diff --git a/Cantera/src/thermo/StoichSubstance.h b/Cantera/src/thermo/StoichSubstance.h
index b1b8ffa26..991ef4962 100644
--- a/Cantera/src/thermo/StoichSubstance.h
+++ b/Cantera/src/thermo/StoichSubstance.h
@@ -5,8 +5,8 @@
  */
 
 /*  
- *  $Date: 2009/01/04 21:28:02 $
- *  $Revision: 1.8 $
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001 California Institute of Technology
  *
diff --git a/Cantera/src/thermo/StoichSubstanceSSTP.cpp b/Cantera/src/thermo/StoichSubstanceSSTP.cpp
index 7c4a6ee93..565e7cfc5 100644
--- a/Cantera/src/thermo/StoichSubstanceSSTP.cpp
+++ b/Cantera/src/thermo/StoichSubstanceSSTP.cpp
@@ -14,7 +14,7 @@
  */
 
 /*
- * $Id: StoichSubstanceSSTP.cpp,v 1.13 2009/01/02 20:04:17 hkmoffa Exp $ 
+ * $Id$ 
  */
 
 #include "ct_defs.h"
diff --git a/Cantera/src/thermo/StoichSubstanceSSTP.h b/Cantera/src/thermo/StoichSubstanceSSTP.h
index 0f59c7888..59b5598c4 100644
--- a/Cantera/src/thermo/StoichSubstanceSSTP.h
+++ b/Cantera/src/thermo/StoichSubstanceSSTP.h
@@ -12,8 +12,8 @@
  */
 
 /*
- *  $Date: 2009/01/02 20:04:17 $
- *  $Revision: 1.12 $
+ *  $Date$
+ *  $Revision$
  */
 
 #ifndef CT_STOICHSUBSTANCESSTP_H
diff --git a/Cantera/src/thermo/SurfPhase.cpp b/Cantera/src/thermo/SurfPhase.cpp
index 4d58bb9d2..44fea43fd 100644
--- a/Cantera/src/thermo/SurfPhase.cpp
+++ b/Cantera/src/thermo/SurfPhase.cpp
@@ -7,8 +7,8 @@
  */
 
 /*
- * $Revision: 1.13 $
- * $Date: 2009/01/24 00:15:00 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2002  California Institute of Technology
diff --git a/Cantera/src/thermo/SurfPhase.h b/Cantera/src/thermo/SurfPhase.h
index 978c1f760..2872c9db4 100644
--- a/Cantera/src/thermo/SurfPhase.h
+++ b/Cantera/src/thermo/SurfPhase.h
@@ -7,8 +7,8 @@
  */
 
 /* 
- *  $Date: 2009/01/04 21:28:02 $
- *  $Revision: 1.11 $
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/Cantera/src/thermo/ThermoFactory.cpp b/Cantera/src/thermo/ThermoFactory.cpp
index 70ad4164d..5cc165beb 100644
--- a/Cantera/src/thermo/ThermoFactory.cpp
+++ b/Cantera/src/thermo/ThermoFactory.cpp
@@ -6,8 +6,8 @@
  */
 
 /*
- * $Revision: 1.20 $
- * $Date: 2009/03/13 03:21:34 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/thermo/ThermoFactory.h b/Cantera/src/thermo/ThermoFactory.h
index 77dccd54e..b9a034086 100644
--- a/Cantera/src/thermo/ThermoFactory.h
+++ b/Cantera/src/thermo/ThermoFactory.h
@@ -6,9 +6,9 @@
  */
 
 /*
- * $Author: hkmoffa $
- * $Revision: 1.10 $
- * $Date: 2009/02/11 20:03:08 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/thermo/ThermoPhase.cpp b/Cantera/src/thermo/ThermoPhase.cpp
index 1e6e1fddd..eb0e60250 100644
--- a/Cantera/src/thermo/ThermoPhase.cpp
+++ b/Cantera/src/thermo/ThermoPhase.cpp
@@ -6,9 +6,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2009/03/03 19:53:34 $
- *  $Revision: 1.18 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/Cantera/src/thermo/ThermoPhase.h b/Cantera/src/thermo/ThermoPhase.h
index 9df05133b..d6c7a64a1 100644
--- a/Cantera/src/thermo/ThermoPhase.h
+++ b/Cantera/src/thermo/ThermoPhase.h
@@ -7,8 +7,8 @@
  */
 
 /*
- *  $Date: 2009/02/18 22:31:32 $
- *  $Revision: 1.26 $
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/Cantera/src/thermo/VPSSMgr.cpp b/Cantera/src/thermo/VPSSMgr.cpp
index 403117bef..1f8e451d8 100644
--- a/Cantera/src/thermo/VPSSMgr.cpp
+++ b/Cantera/src/thermo/VPSSMgr.cpp
@@ -12,9 +12,9 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2009/05/28 23:08:06 $
- *  $Revision: 1.8 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 // turn off warnings under Windows
diff --git a/Cantera/src/thermo/VPSSMgr.h b/Cantera/src/thermo/VPSSMgr.h
index 9b2d913c2..5be3b3217 100644
--- a/Cantera/src/thermo/VPSSMgr.h
+++ b/Cantera/src/thermo/VPSSMgr.h
@@ -8,9 +8,9 @@
  */
 
 /*
- * $Author: hkmoffa $
- * $Revision: 1.5 $
- * $Date: 2009/05/28 23:08:06 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/thermo/VPSSMgrFactory.cpp b/Cantera/src/thermo/VPSSMgrFactory.cpp
index 186bf5576..6e3962fb6 100644
--- a/Cantera/src/thermo/VPSSMgrFactory.cpp
+++ b/Cantera/src/thermo/VPSSMgrFactory.cpp
@@ -6,7 +6,7 @@
  *    \link Cantera::VPSSMgrFactory VPSSMgrFactory\endlink);
  */
 /*
- * $Id: VPSSMgrFactory.cpp,v 1.8 2009/03/04 01:01:57 hkmoffa Exp $
+ * $Id$
  */
 
 /*
diff --git a/Cantera/src/thermo/VPSSMgrFactory.h b/Cantera/src/thermo/VPSSMgrFactory.h
index 9d55d7957..5683608b3 100644
--- a/Cantera/src/thermo/VPSSMgrFactory.h
+++ b/Cantera/src/thermo/VPSSMgrFactory.h
@@ -6,8 +6,8 @@
  */
 
 /*
- * $Revision: 1.5 $
- * $Date: 2009/02/11 20:03:08 $
+ * $Revision$
+ * $Date$
  */
 
 /*
diff --git a/Cantera/src/thermo/VPSSMgr_ConstVol.cpp b/Cantera/src/thermo/VPSSMgr_ConstVol.cpp
index bf05a8640..12bc083be 100644
--- a/Cantera/src/thermo/VPSSMgr_ConstVol.cpp
+++ b/Cantera/src/thermo/VPSSMgr_ConstVol.cpp
@@ -12,9 +12,9 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2009/05/28 23:08:06 $
- *  $Revision: 1.4 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 // turn off warnings under Windows
diff --git a/Cantera/src/thermo/VPSSMgr_ConstVol.h b/Cantera/src/thermo/VPSSMgr_ConstVol.h
index 14a867530..52ead4294 100644
--- a/Cantera/src/thermo/VPSSMgr_ConstVol.h
+++ b/Cantera/src/thermo/VPSSMgr_ConstVol.h
@@ -6,9 +6,9 @@
  *  \link Cantera::VPSSMgr_ConstVol VPSSMgr_ConstVol \endlink).
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.3 $
- * $Date: 2009/05/28 23:08:06 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/thermo/VPSSMgr_General.cpp b/Cantera/src/thermo/VPSSMgr_General.cpp
index f75c9ad27..fc90e6e4e 100644
--- a/Cantera/src/thermo/VPSSMgr_General.cpp
+++ b/Cantera/src/thermo/VPSSMgr_General.cpp
@@ -12,9 +12,9 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2009/05/28 23:08:06 $
- *  $Revision: 1.5 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 // turn off warnings under Windows
diff --git a/Cantera/src/thermo/VPSSMgr_General.h b/Cantera/src/thermo/VPSSMgr_General.h
index 32e2011d2..458c5e5c4 100644
--- a/Cantera/src/thermo/VPSSMgr_General.h
+++ b/Cantera/src/thermo/VPSSMgr_General.h
@@ -7,8 +7,8 @@
  * class \link Cantera::VPSSMgr_General VPSSMgr_General\endlink).
  */
 /*
- * $Revision: 1.4 $
- * $Date: 2009/05/28 23:08:06 $
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite (2007) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/thermo/VPSSMgr_IdealGas.cpp b/Cantera/src/thermo/VPSSMgr_IdealGas.cpp
index 7eedbc033..34ef28457 100644
--- a/Cantera/src/thermo/VPSSMgr_IdealGas.cpp
+++ b/Cantera/src/thermo/VPSSMgr_IdealGas.cpp
@@ -12,9 +12,9 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2009/05/28 23:08:06 $
- *  $Revision: 1.3 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 // turn off warnings under Windows
diff --git a/Cantera/src/thermo/VPSSMgr_IdealGas.h b/Cantera/src/thermo/VPSSMgr_IdealGas.h
index ee123a3aa..146fa3e0a 100644
--- a/Cantera/src/thermo/VPSSMgr_IdealGas.h
+++ b/Cantera/src/thermo/VPSSMgr_IdealGas.h
@@ -7,9 +7,9 @@
  * class \link Cantera::VPSSMgr_IdealGas VPSSMgr_IdealGas\endlink).
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.3 $
- * $Date: 2009/05/28 23:08:06 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 /*
diff --git a/Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp b/Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp
index 5a156420a..40a65a8eb 100644
--- a/Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp
+++ b/Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp
@@ -15,8 +15,8 @@
  */
 
 /*
- *  $Date: 2009/05/28 23:08:06 $
- *  $Revision: 1.9 $
+ *  $Date$
+ *  $Revision$
  */
 
 // turn off warnings under Windows
diff --git a/Cantera/src/thermo/VPSSMgr_Water_ConstVol.h b/Cantera/src/thermo/VPSSMgr_Water_ConstVol.h
index 7d8a248de..057a1d6f9 100644
--- a/Cantera/src/thermo/VPSSMgr_Water_ConstVol.h
+++ b/Cantera/src/thermo/VPSSMgr_Water_ConstVol.h
@@ -9,8 +9,8 @@
  */
 
 /*
- * $Revision: 1.7 $
- * $Date: 2009/05/28 23:08:06 $
+ * $Revision$
+ * $Date$
  */
 
 /*
diff --git a/Cantera/src/thermo/VPSSMgr_Water_HKFT.cpp b/Cantera/src/thermo/VPSSMgr_Water_HKFT.cpp
index ac725e84b..0b33cdd63 100644
--- a/Cantera/src/thermo/VPSSMgr_Water_HKFT.cpp
+++ b/Cantera/src/thermo/VPSSMgr_Water_HKFT.cpp
@@ -15,8 +15,8 @@
  */
 
 /*
- *  $Date: 2009/05/28 23:08:06 $
- *  $Revision: 1.13 $
+ *  $Date$
+ *  $Revision$
  */
 
 // turn off warnings under Windows
diff --git a/Cantera/src/thermo/VPSSMgr_Water_HKFT.h b/Cantera/src/thermo/VPSSMgr_Water_HKFT.h
index d54d7dd99..462eae89c 100644
--- a/Cantera/src/thermo/VPSSMgr_Water_HKFT.h
+++ b/Cantera/src/thermo/VPSSMgr_Water_HKFT.h
@@ -8,8 +8,8 @@
  */
 
 /*
- * $Revision: 1.7 $
- * $Date: 2009/05/28 23:08:06 $
+ * $Revision$
+ * $Date$
  */
 
 /*
diff --git a/Cantera/src/thermo/VPSSMgr_types.h b/Cantera/src/thermo/VPSSMgr_types.h
index 9d7512563..4d55e1eff 100644
--- a/Cantera/src/thermo/VPSSMgr_types.h
+++ b/Cantera/src/thermo/VPSSMgr_types.h
@@ -8,9 +8,9 @@
  *        class \link Cantera::VPSSMgr VPSSMgr\endlink).
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2008/08/23 00:53:55 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of 
diff --git a/Cantera/src/thermo/VPStandardStateTP.cpp b/Cantera/src/thermo/VPStandardStateTP.cpp
index 6a79674aa..0c4dd874e 100644
--- a/Cantera/src/thermo/VPStandardStateTP.cpp
+++ b/Cantera/src/thermo/VPStandardStateTP.cpp
@@ -11,9 +11,9 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2009/01/04 06:34:20 $
- *  $Revision: 1.16 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 // turn off warnings under Windows
diff --git a/Cantera/src/thermo/VPStandardStateTP.h b/Cantera/src/thermo/VPStandardStateTP.h
index f9097565d..4df17709c 100644
--- a/Cantera/src/thermo/VPStandardStateTP.h
+++ b/Cantera/src/thermo/VPStandardStateTP.h
@@ -14,8 +14,8 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Date: 2009/03/27 00:38:57 $
- *  $Revision: 1.20 $
+ *  $Date$
+ *  $Revision$
  */
 
 #ifndef CT_VPSTANDARDSTATETP_H
diff --git a/Cantera/src/thermo/WaterProps.cpp b/Cantera/src/thermo/WaterProps.cpp
index 64ed23fa1..5501a7129 100644
--- a/Cantera/src/thermo/WaterProps.cpp
+++ b/Cantera/src/thermo/WaterProps.cpp
@@ -7,7 +7,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: WaterProps.cpp,v 1.9 2008/12/17 17:04:47 hkmoffa Exp $
+ * $Id$
  */
 
 //@{
diff --git a/Cantera/src/thermo/WaterProps.h b/Cantera/src/thermo/WaterProps.h
index f3ca51cbb..b6099f7df 100644
--- a/Cantera/src/thermo/WaterProps.h
+++ b/Cantera/src/thermo/WaterProps.h
@@ -11,7 +11,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: WaterProps.h,v 1.5 2008/08/23 00:53:55 hkmoffa Exp $
+ * $Id$
  */
 
 #ifndef CT_WATERPROPS_H
diff --git a/Cantera/src/thermo/WaterPropsIAPWS.cpp b/Cantera/src/thermo/WaterPropsIAPWS.cpp
index 60f2a5fee..0a7a83f9c 100644
--- a/Cantera/src/thermo/WaterPropsIAPWS.cpp
+++ b/Cantera/src/thermo/WaterPropsIAPWS.cpp
@@ -10,7 +10,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: WaterPropsIAPWS.cpp,v 1.17 2008/12/17 17:01:29 hkmoffa Exp $
+ * $Id$
  */
 
 #include "WaterPropsIAPWS.h"
diff --git a/Cantera/src/thermo/WaterPropsIAPWS.h b/Cantera/src/thermo/WaterPropsIAPWS.h
index 023d076a9..b3c722b1d 100644
--- a/Cantera/src/thermo/WaterPropsIAPWS.h
+++ b/Cantera/src/thermo/WaterPropsIAPWS.h
@@ -10,7 +10,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: WaterPropsIAPWS.h,v 1.16 2008/09/29 20:03:57 hkmoffa Exp $
+ * $Id$
  */
 
 #ifndef WATERPROPSIAPWS_H
diff --git a/Cantera/src/thermo/WaterPropsIAPWSphi.cpp b/Cantera/src/thermo/WaterPropsIAPWSphi.cpp
index 4299b97cd..d91bce64b 100644
--- a/Cantera/src/thermo/WaterPropsIAPWSphi.cpp
+++ b/Cantera/src/thermo/WaterPropsIAPWSphi.cpp
@@ -9,7 +9,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: WaterPropsIAPWSphi.cpp,v 1.12 2008/12/29 22:53:36 hkmoffa Exp $
+ * $Id$
  */
 
 #include "WaterPropsIAPWSphi.h"
diff --git a/Cantera/src/thermo/WaterPropsIAPWSphi.h b/Cantera/src/thermo/WaterPropsIAPWSphi.h
index 6a5b0ca87..1691214ae 100644
--- a/Cantera/src/thermo/WaterPropsIAPWSphi.h
+++ b/Cantera/src/thermo/WaterPropsIAPWSphi.h
@@ -11,7 +11,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: WaterPropsIAPWSphi.h,v 1.8 2008/09/12 21:51:04 hkmoffa Exp $
+ * $Id$
  */
 
 #ifndef WATERPROPSIAPWSPHI_H
diff --git a/Cantera/src/thermo/WaterSSTP.cpp b/Cantera/src/thermo/WaterSSTP.cpp
index af1922645..863d96803 100644
--- a/Cantera/src/thermo/WaterSSTP.cpp
+++ b/Cantera/src/thermo/WaterSSTP.cpp
@@ -9,7 +9,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: WaterSSTP.cpp,v 1.17 2009/03/27 00:38:58 hkmoffa Exp $
+ * $Id$
  */
 
 #include "xml.h"
diff --git a/Cantera/src/thermo/WaterSSTP.h b/Cantera/src/thermo/WaterSSTP.h
index bbc46b18a..b4add6b2f 100644
--- a/Cantera/src/thermo/WaterSSTP.h
+++ b/Cantera/src/thermo/WaterSSTP.h
@@ -9,7 +9,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- * $Id: WaterSSTP.h,v 1.13 2009/03/27 00:38:58 hkmoffa Exp $
+ * $Id$
  */
 
 #ifndef CT_WATERSSTP_H
diff --git a/Cantera/src/thermo/electrolytes.h b/Cantera/src/thermo/electrolytes.h
index 97bf75bef..eecd6f878 100644
--- a/Cantera/src/thermo/electrolytes.h
+++ b/Cantera/src/thermo/electrolytes.h
@@ -10,7 +10,7 @@
  * U.S. Government retains certain rights in this software.
  */
 /*
- *  $Id: electrolytes.h,v 1.1 2006/07/06 15:41:15 hkmoffa Exp $
+ *  $Id$
  */
 #ifndef CT_ELECTROLYTES_H
 #define CT_ELECTROLYTES_H
diff --git a/Cantera/src/thermo/phasereport.cpp b/Cantera/src/thermo/phasereport.cpp
index 8a5830d6c..af3dfdacc 100644
--- a/Cantera/src/thermo/phasereport.cpp
+++ b/Cantera/src/thermo/phasereport.cpp
@@ -4,8 +4,8 @@
  */
 
 /* 
- *  $Date: 2009/01/14 22:46:33 $
- *  $Revision: 1.8 $
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001 California Institute of Technology
  *
diff --git a/Cantera/src/thermo/speciesThermoTypes.h b/Cantera/src/thermo/speciesThermoTypes.h
index 2e570ba5b..f8e742821 100644
--- a/Cantera/src/thermo/speciesThermoTypes.h
+++ b/Cantera/src/thermo/speciesThermoTypes.h
@@ -4,9 +4,9 @@
  *       reference-state thermodynamics managers (see \ref spthermo)
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.6 $
- * $Date: 2008/09/29 20:03:57 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/transport/AqueousTransport.cpp b/Cantera/src/transport/AqueousTransport.cpp
index 3b7033dfa..df6fdf188 100644
--- a/Cantera/src/transport/AqueousTransport.cpp
+++ b/Cantera/src/transport/AqueousTransport.cpp
@@ -3,8 +3,8 @@
  *  Transport properties for aqueous systems
  */
 /*
- * $Revision: 1.4 $
- * $Date: 2009/03/27 18:24:39 $
+ * $Revision$
+ * $Date$
  */
 
 
diff --git a/Cantera/src/transport/AqueousTransport.h b/Cantera/src/transport/AqueousTransport.h
index 7179fe5e9..f5bfc3d8f 100644
--- a/Cantera/src/transport/AqueousTransport.h
+++ b/Cantera/src/transport/AqueousTransport.h
@@ -3,8 +3,8 @@
  *   Header file defining class AqueousTransport
  */
 /* 
- * $Revision: 1.4 $
- * $Date: 2009/03/27 18:24:39 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/transport/DustyGasTransport.cpp b/Cantera/src/transport/DustyGasTransport.cpp
index c62e91bea..fee667dde 100644
--- a/Cantera/src/transport/DustyGasTransport.cpp
+++ b/Cantera/src/transport/DustyGasTransport.cpp
@@ -8,9 +8,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2009/03/27 18:24:39 $
- *  $Revision: 1.12 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2003 California Institute of Technology
  *  See file License.txt for licensing information
diff --git a/Cantera/src/transport/LiquidTransport.cpp b/Cantera/src/transport/LiquidTransport.cpp
index fe61d4d43..cd196c725 100644
--- a/Cantera/src/transport/LiquidTransport.cpp
+++ b/Cantera/src/transport/LiquidTransport.cpp
@@ -3,8 +3,8 @@
  *  Mixture-averaged transport properties for ideal gas mixtures.
  */
 /* 
- * $Revision: 1.10 $
- * $Date: 2009/03/24 20:44:30 $
+ * $Revision$
+ * $Date$
  */
 
 #include "ThermoPhase.h"
diff --git a/Cantera/src/transport/LiquidTransport.h b/Cantera/src/transport/LiquidTransport.h
index 4af44619b..a8be0e628 100644
--- a/Cantera/src/transport/LiquidTransport.h
+++ b/Cantera/src/transport/LiquidTransport.h
@@ -4,8 +4,8 @@
  *   Header file defining class LiquidTransport
  */
 /*
- * $Revision: 1.9 $
- * $Date: 2009/03/27 18:24:39 $
+ * $Revision$
+ * $Date$
  */
 
 #ifndef CT_LIQUIDTRAN_H
diff --git a/Cantera/src/transport/LiquidTransportData.h b/Cantera/src/transport/LiquidTransportData.h
index ee1faa948..7b3d28609 100644
--- a/Cantera/src/transport/LiquidTransportData.h
+++ b/Cantera/src/transport/LiquidTransportData.h
@@ -4,9 +4,9 @@
  *     (see \link Cantera::TransportFactory TransportFactory\endlink)
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/24 18:19:01 $
- *  $Revision: 1.14 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *
  *
diff --git a/Cantera/src/transport/MMCollisionInt.cpp b/Cantera/src/transport/MMCollisionInt.cpp
index 6639c9c9d..c50855c32 100755
--- a/Cantera/src/transport/MMCollisionInt.cpp
+++ b/Cantera/src/transport/MMCollisionInt.cpp
@@ -3,9 +3,9 @@
  */
 
 /*
- * $Author: hkmoffa $
- * $Revision: 1.11 $
- * $Date: 2008/12/17 17:06:24 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology */
diff --git a/Cantera/src/transport/MMCollisionInt.h b/Cantera/src/transport/MMCollisionInt.h
index 0a915a0f9..797a30ea5 100755
--- a/Cantera/src/transport/MMCollisionInt.h
+++ b/Cantera/src/transport/MMCollisionInt.h
@@ -3,9 +3,9 @@
  *  Monk and Monchick collision integrals
  */
 /*
- * $Author: hkmoffa $
- * $Revision: 1.5 $
- * $Date: 2007/07/26 21:55:32 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology 
diff --git a/Cantera/src/transport/Makefile.in b/Cantera/src/transport/Makefile.in
index 9f52f08e1..8302e9a54 100644
--- a/Cantera/src/transport/Makefile.in
+++ b/Cantera/src/transport/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
 # 
-#  $Date: 2009/02/15 19:41:33 $
-#  $Revision: 1.22 $
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2002 California Institute of Technology
 #
diff --git a/Cantera/src/transport/MixTransport.cpp b/Cantera/src/transport/MixTransport.cpp
index 2dd2da5da..4f70664af 100755
--- a/Cantera/src/transport/MixTransport.cpp
+++ b/Cantera/src/transport/MixTransport.cpp
@@ -3,9 +3,9 @@
  *  Mixture-averaged transport properties for ideal gas mixtures.
  */
 
-/* $Author: hkmoffa $
- * $Revision: 1.16 $
- * $Date: 2009/03/27 18:24:39 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 
 // copyright 2001 California Institute of Technology
diff --git a/Cantera/src/transport/MixTransport.h b/Cantera/src/transport/MixTransport.h
index 55b49503a..8ef0ef52a 100644
--- a/Cantera/src/transport/MixTransport.h
+++ b/Cantera/src/transport/MixTransport.h
@@ -5,9 +5,9 @@
  *    (see \ref tranprops and \link Cantera::MixTransport MixTransport \endlink) .
  *
  */
-/* $Author: hkmoffa $
- * $Revision: 1.11 $
- * $Date: 2009/03/27 18:24:39 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 // Copyright 2001  California Institute of Technology
 
diff --git a/Cantera/src/transport/MultiTransport.cpp b/Cantera/src/transport/MultiTransport.cpp
index e3b83db98..4bc72954c 100755
--- a/Cantera/src/transport/MultiTransport.cpp
+++ b/Cantera/src/transport/MultiTransport.cpp
@@ -5,9 +5,9 @@
  *
  * @ingroup transportProps
  *
- *  $Author: hkmoffa $
- *  $Date: 2009/03/27 18:24:39 $
- *  $Revision: 1.17 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001 California Institute of Technology
  *  See file License.txt for licensing information
diff --git a/Cantera/src/transport/SimpleTransport.cpp b/Cantera/src/transport/SimpleTransport.cpp
index d9aa801f6..69d4a8628 100644
--- a/Cantera/src/transport/SimpleTransport.cpp
+++ b/Cantera/src/transport/SimpleTransport.cpp
@@ -3,8 +3,8 @@
  *  Simple mostly constant transport properties
  */
 /* 
- * $Revision: 1.10 $
- * $Date: 2009/03/24 20:44:30 $
+ * $Revision$
+ * $Date$
  */
 
 #include "ThermoPhase.h"
diff --git a/Cantera/src/transport/SimpleTransport.h b/Cantera/src/transport/SimpleTransport.h
index 875403a01..ba13dacb6 100644
--- a/Cantera/src/transport/SimpleTransport.h
+++ b/Cantera/src/transport/SimpleTransport.h
@@ -4,8 +4,8 @@
  *   Header file defining class SimpleTransport
  */
 /*
- * $Revision: 1.9 $
- * $Date: 2009/03/27 18:24:39 $
+ * $Revision$
+ * $Date$
  */
 
 #ifndef CT_SIMPLETRAN_H
diff --git a/Cantera/src/transport/SolidTransport.cpp b/Cantera/src/transport/SolidTransport.cpp
index 36c6b92f9..6401d7f45 100644
--- a/Cantera/src/transport/SolidTransport.cpp
+++ b/Cantera/src/transport/SolidTransport.cpp
@@ -3,9 +3,9 @@
  *  @file SolidTransport.cpp
  */
 
-/* $Author: hkmoffa $
- * $Revision: 1.10 $
- * $Date: 2009/03/27 18:24:39 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 
 // copyright 2008 California Institute of Technology
diff --git a/Cantera/src/transport/SolidTransport.h b/Cantera/src/transport/SolidTransport.h
index 76e18f943..31e5fe0a1 100644
--- a/Cantera/src/transport/SolidTransport.h
+++ b/Cantera/src/transport/SolidTransport.h
@@ -4,9 +4,9 @@
  *   Header file defining class SolidTransport
  */
 
-/* $Author: hkmoffa $
- * $Revision: 1.7 $
- * $Date: 2009/03/27 18:24:39 $
+/* $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2003  California Institute of Technology
diff --git a/Cantera/src/transport/TransportBase.cpp b/Cantera/src/transport/TransportBase.cpp
index 75da215b7..f0c881907 100644
--- a/Cantera/src/transport/TransportBase.cpp
+++ b/Cantera/src/transport/TransportBase.cpp
@@ -3,8 +3,8 @@
  *  Mixture-averaged transport properties for ideal gas mixtures.
  */
 /* 
- * $Revision: 1.1 $
- * $Date: 2009/02/15 19:41:33 $
+ * $Revision$
+ * $Date$
  */
 
 #include "ThermoPhase.h"
diff --git a/Cantera/src/transport/TransportBase.h b/Cantera/src/transport/TransportBase.h
index 12309ec30..1d9070555 100644
--- a/Cantera/src/transport/TransportBase.h
+++ b/Cantera/src/transport/TransportBase.h
@@ -8,8 +8,8 @@
  */
 
 /*
- * $Revision: 1.23 $
- * $Date: 2009/03/27 18:24:39 $
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001-2003  California Institute of Technology
diff --git a/Cantera/src/transport/TransportFactory.h b/Cantera/src/transport/TransportFactory.h
index 3c016ad3b..d41e23d21 100644
--- a/Cantera/src/transport/TransportFactory.h
+++ b/Cantera/src/transport/TransportFactory.h
@@ -4,9 +4,9 @@
  *     (see \link Cantera::TransportFactory TransportFactory\endlink)
  */
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/24 18:19:01 $
- *  $Revision: 1.14 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2001 California Institute of Technology
  *
diff --git a/Cantera/src/transport/WaterTransport.h b/Cantera/src/transport/WaterTransport.h
index cd858ee8d..b4ad85348 100644
--- a/Cantera/src/transport/WaterTransport.h
+++ b/Cantera/src/transport/WaterTransport.h
@@ -3,8 +3,8 @@
  *   Header file defining class LiquidTransport
  */
 /*
- * $Revision: 1.9 $
- * $Date: 2009/03/27 18:24:39 $
+ * $Revision$
+ * $Date$
  */
 
 #ifndef CT_WATERTRAN_H
diff --git a/Cantera/src/zeroD/ConstPressureReactor.h b/Cantera/src/zeroD/ConstPressureReactor.h
index 432b9bed7..0e82d1306 100644
--- a/Cantera/src/zeroD/ConstPressureReactor.h
+++ b/Cantera/src/zeroD/ConstPressureReactor.h
@@ -1,9 +1,9 @@
 /**
  *  @file Reactor.h
  *
- * $Author: dggoodwin $
- * $Revision: 1.3 $
- * $Date: 2006/11/27 21:43:34 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/zeroD/FlowDevice.h b/Cantera/src/zeroD/FlowDevice.h
index 8eea2d59a..3273f5c5e 100644
--- a/Cantera/src/zeroD/FlowDevice.h
+++ b/Cantera/src/zeroD/FlowDevice.h
@@ -1,9 +1,9 @@
 /**
  *  @file FlowDevice.h
  *
- *  $Author: dggoodwin $
- *  $Date: 2007/05/04 14:41:28 $
- *  $Revision: 1.6 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/zeroD/FlowReactor.h b/Cantera/src/zeroD/FlowReactor.h
index e6fa4cb8a..e6b750d79 100644
--- a/Cantera/src/zeroD/FlowReactor.h
+++ b/Cantera/src/zeroD/FlowReactor.h
@@ -1,9 +1,9 @@
 /**
  *  @file FlowReactor.h
  *
- * $Author: dggoodwin $
- * $Revision: 1.3 $
- * $Date: 2006/11/27 21:43:34 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/zeroD/Makefile.in b/Cantera/src/zeroD/Makefile.in
index 30bd426bd..8c3000018 100644
--- a/Cantera/src/zeroD/Makefile.in
+++ b/Cantera/src/zeroD/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2008/12/30 21:49:41 $
-#  $Revision: 1.17 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2002 California Institute of Technology
 #
diff --git a/Cantera/src/zeroD/PID_Controller.h b/Cantera/src/zeroD/PID_Controller.h
index 91b3850d7..77560dfd0 100644
--- a/Cantera/src/zeroD/PID_Controller.h
+++ b/Cantera/src/zeroD/PID_Controller.h
@@ -1,9 +1,9 @@
 /**
  *  @file PID_Controller.h
  *
- * $Author: dggoodwin $
- * $Revision: 1.2 $
- * $Date: 2005/06/18 17:01:12 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/zeroD/Reactor.h b/Cantera/src/zeroD/Reactor.h
index e5e515b04..aca2506ce 100644
--- a/Cantera/src/zeroD/Reactor.h
+++ b/Cantera/src/zeroD/Reactor.h
@@ -1,9 +1,9 @@
 /**
  *  @file Reactor.h
  *
- * $Author: dggoodwin $
- * $Revision: 1.11 $
- * $Date: 2007/05/04 14:41:28 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/zeroD/ReactorBase.cpp b/Cantera/src/zeroD/ReactorBase.cpp
index 60314a488..9348e6d66 100644
--- a/Cantera/src/zeroD/ReactorBase.cpp
+++ b/Cantera/src/zeroD/ReactorBase.cpp
@@ -1,9 +1,9 @@
 /**
  *  @file ReactorBase.cpp
  *
- * $Author: dggoodwin $
- * $Revision: 1.11 $
- * $Date: 2006/11/27 21:43:34 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/zeroD/ReactorBase.h b/Cantera/src/zeroD/ReactorBase.h
index 3558e099f..047265478 100644
--- a/Cantera/src/zeroD/ReactorBase.h
+++ b/Cantera/src/zeroD/ReactorBase.h
@@ -3,9 +3,9 @@
  */
 
 /*
- * $Author: dggoodwin $
- * $Revision: 1.14 $
- * $Date: 2007/07/27 03:38:24 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/zeroD/ReactorFactory.cpp b/Cantera/src/zeroD/ReactorFactory.cpp
index 073add4ad..ee07a21f3 100644
--- a/Cantera/src/zeroD/ReactorFactory.cpp
+++ b/Cantera/src/zeroD/ReactorFactory.cpp
@@ -3,9 +3,9 @@
  */
 
 /*
- * $Author: dggoodwin $
- * $Revision: 1.3 $
- * $Date: 2007/05/10 03:28:32 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2006  California Institute of Technology
diff --git a/Cantera/src/zeroD/ReactorFactory.h b/Cantera/src/zeroD/ReactorFactory.h
index 30c29c6b1..d1da8024f 100644
--- a/Cantera/src/zeroD/ReactorFactory.h
+++ b/Cantera/src/zeroD/ReactorFactory.h
@@ -3,9 +3,9 @@
  */
 
 /*
- * $Author: dggoodwin $
- * $Revision: 1.3 $
- * $Date: 2007/05/10 03:28:32 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/zeroD/ReactorNet.h b/Cantera/src/zeroD/ReactorNet.h
index f7265c0a0..021610a23 100644
--- a/Cantera/src/zeroD/ReactorNet.h
+++ b/Cantera/src/zeroD/ReactorNet.h
@@ -3,9 +3,9 @@
  */
 
 /*
- * $Author: hkmoffa $
- * $Revision: 1.16 $
- * $Date: 2009/07/11 17:35:05 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2004  California Institute of Technology
diff --git a/Cantera/src/zeroD/Reservoir.h b/Cantera/src/zeroD/Reservoir.h
index 7ae625f61..d60539df3 100644
--- a/Cantera/src/zeroD/Reservoir.h
+++ b/Cantera/src/zeroD/Reservoir.h
@@ -3,9 +3,9 @@
  */
 
 /*
- * $Author: dggoodwin $
- * $Revision: 1.3 $
- * $Date: 2005/06/18 17:01:12 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/src/zeroD/Wall.h b/Cantera/src/zeroD/Wall.h
index c07ef168c..4afeb4b3f 100644
--- a/Cantera/src/zeroD/Wall.h
+++ b/Cantera/src/zeroD/Wall.h
@@ -3,9 +3,9 @@
  *  Header file for class Wall.
  */
 
-/*  $Author: dggoodwin $
- *  $Date: 2007/05/04 14:41:28 $
- *  $Revision: 1.9 $
+/*  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 // Copyright 2001-2004  California Institute of Technology
diff --git a/Cantera/src/zeroD/flowControllers.h b/Cantera/src/zeroD/flowControllers.h
index 177e33bba..07799d48e 100644
--- a/Cantera/src/zeroD/flowControllers.h
+++ b/Cantera/src/zeroD/flowControllers.h
@@ -3,9 +3,9 @@
  *
  *  Some flow devices derived from class FlowDevice.
  *
- * $Author: dggoodwin $
- * $Revision: 1.6 $
- * $Date: 2007/05/04 14:41:28 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2001  California Institute of Technology
diff --git a/Cantera/user/Makefile.in b/Cantera/user/Makefile.in
index 2160a2aa5..42548c761 100644
--- a/Cantera/user/Makefile.in
+++ b/Cantera/user/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 ###############################################################
-#  $Author: hkmoffa $
-#  $Date: 2008/01/01 19:19:50 $
-#  $Revision: 1.7 $
+#  $Author$
+#  $Date$
+#  $Revision$
 #
 #  Copyright 2002 California Institute of Technology
 #
diff --git a/Makefile.in b/Makefile.in
index 7fa9e0934..410fee99d 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Makefile.in,v 1.96 2009/03/25 01:11:48 hkmoffa Exp $
+# $Id$
 #
 export_dir = $(HOME)/sfdist
 version = @ctversion@
diff --git a/apps/bvp/stagnation.cpp b/apps/bvp/stagnation.cpp
index ac885ae38..e0357b63c 100644
--- a/apps/bvp/stagnation.cpp
+++ b/apps/bvp/stagnation.cpp
@@ -3,9 +3,9 @@
  */
 
 /*
- * $Author: dggoodwin $
- * $Revision: 1.1 $
- * $Date: 2007/11/06 21:13:09 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 
 // Copyright 2002  California Institute of Technology
diff --git a/data/transport/misc_tran.dat b/data/transport/misc_tran.dat
index 586df5bea..71bce0d79 100644
--- a/data/transport/misc_tran.dat
+++ b/data/transport/misc_tran.dat
@@ -3,9 +3,9 @@
 !
 ! Miscellaneous collection of transport parameters
 !
-! $Author: hkmoffa $
-! $Date: 2003/09/05 14:45:59 $
-! $Revision: 1.1 $
+! $Author$
+! $Date$
+! $Revision$
 !  
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
diff --git a/examples/cxx/equil_example1.cpp b/examples/cxx/equil_example1.cpp
index 1d812033d..d188be7f0 100755
--- a/examples/cxx/equil_example1.cpp
+++ b/examples/cxx/equil_example1.cpp
@@ -2,9 +2,9 @@
 //
 //  chemical equilibrium
 //
-//  $Author: hkmoffa $
-//  $Revision: 1.15 $
-//  $Date: 2008/02/16 21:33:37 $
+//  $Author$
+//  $Revision$
+//  $Date$
 //
 //  copyright California Institute of Technology 2002
 //
diff --git a/examples/cxx/kinetics_example1.cpp b/examples/cxx/kinetics_example1.cpp
index 74500c287..ed8172356 100755
--- a/examples/cxx/kinetics_example1.cpp
+++ b/examples/cxx/kinetics_example1.cpp
@@ -2,9 +2,9 @@
 //
 //  zero-dimensional kinetics example program
 //
-//  $Author: hkmoffa $
-//  $Revision: 1.13 $
-//  $Date: 2009/07/11 17:25:05 $
+//  $Author$
+//  $Revision$
+//  $Date$
 //
 //  copyright California Institute of Technology 2002
 //
diff --git a/examples/cxx/kinetics_example2.cpp b/examples/cxx/kinetics_example2.cpp
index 391a7b7ea..2aa5ee684 100755
--- a/examples/cxx/kinetics_example2.cpp
+++ b/examples/cxx/kinetics_example2.cpp
@@ -2,9 +2,9 @@
 //
 //  zero-dimensional kinetics example program
 //
-//  $Author: hkmoffa $
-//  $Revision: 1.8 $
-//  $Date: 2009/07/11 17:25:05 $
+//  $Author$
+//  $Revision$
+//  $Date$
 //
 //  copyright California Institute of Technology 2002
 //
diff --git a/examples/cxx/kinetics_example3.cpp b/examples/cxx/kinetics_example3.cpp
index e2be7ff7b..ab2932cfb 100644
--- a/examples/cxx/kinetics_example3.cpp
+++ b/examples/cxx/kinetics_example3.cpp
@@ -2,9 +2,9 @@
 //
 //  zero-dimensional kinetics example program
 //
-//  $Author: hkmoffa $
-//  $Revision: 1.5 $
-//  $Date: 2009/07/11 17:25:05 $
+//  $Author$
+//  $Revision$
+//  $Date$
 //
 //  copyright California Institute of Technology 2006
 //
diff --git a/examples/cxx/rxnpath_example1.cpp b/examples/cxx/rxnpath_example1.cpp
index 9a7756aad..5ad7690ae 100755
--- a/examples/cxx/rxnpath_example1.cpp
+++ b/examples/cxx/rxnpath_example1.cpp
@@ -2,9 +2,9 @@
 //
 //  reaction path diagrams
 //
-//  $Author: hkmoffa $
-//  $Revision: 1.9 $
-//  $Date: 2009/07/11 17:25:05 $
+//  $Author$
+//  $Revision$
+//  $Date$
 //
 //  copyright California Institute of Technology 2002
 //
diff --git a/examples/cxx/transport_example1.cpp b/examples/cxx/transport_example1.cpp
index 65fd37499..d483c70b0 100755
--- a/examples/cxx/transport_example1.cpp
+++ b/examples/cxx/transport_example1.cpp
@@ -2,9 +2,9 @@
 //
 //  mixture-averaged transport properties
 //
-//  $Author: hkmoffa $
-//  $Revision: 1.7 $
-//  $Date: 2008/02/16 21:33:37 $
+//  $Author$
+//  $Revision$
+//  $Date$
 //
 //  copyright California Institute of Technology 2002
 //
diff --git a/examples/cxx/transport_example2.cpp b/examples/cxx/transport_example2.cpp
index 83086651b..e5ac40030 100755
--- a/examples/cxx/transport_example2.cpp
+++ b/examples/cxx/transport_example2.cpp
@@ -2,9 +2,9 @@
 //
 //  mixture-averaged transport properties
 //
-//  $Author: hkmoffa $
-//  $Revision: 1.6 $
-//  $Date: 2008/02/16 21:33:38 $
+//  $Author$
+//  $Revision$
+//  $Date$
 //
 //  copyright California Institute of Technology 2002
 //
diff --git a/ext/Makefile.in b/ext/Makefile.in
index d902d6cfe..6189ca913 100755
--- a/ext/Makefile.in
+++ b/ext/Makefile.in
@@ -1,9 +1,9 @@
 #/bin/sh
 #
 # $Source: /cvsroot/cantera/cantera/ext/Makefile.in,v $
-# $Author: dggoodwin $
-# $Revision: 1.10 $
-# $Date: 2008/02/13 06:43:27 $
+# $Author$
+# $Revision$
+# $Date$
 #
 # Makefile for ext directory
 #
diff --git a/ext/blas/Makefile.in b/ext/blas/Makefile.in
index caef518a0..e9417b30f 100755
--- a/ext/blas/Makefile.in
+++ b/ext/blas/Makefile.in
@@ -1,7 +1,7 @@
 #/bin/sh
 # $License$
 #
-# $Id: Makefile.in,v 1.8 2008/12/30 21:49:41 hkmoffa Exp $
+# $Id$
 #
 do_ranlib = @DO_RANLIB@                                                                                                                     
 BLASLIB = @buildlib@/libctblas.a
diff --git a/ext/cvode/Makefile.in b/ext/cvode/Makefile.in
index ef438dc2b..494dc2185 100755
--- a/ext/cvode/Makefile.in
+++ b/ext/cvode/Makefile.in
@@ -1,8 +1,8 @@
 #
 # $Source: /cvsroot/cantera/cantera/ext/cvode/Makefile.in,v $
-# $Author: hkmoffa $
-# $Revision: 1.10 $
-# $Date: 2008/12/30 21:49:42 $
+# $Author$
+# $Revision$
+# $Date$
 #
 #----------------------------------------------------------------------------
 #                                CVODE                                      
diff --git a/ext/f2c_blas/Makefile.in b/ext/f2c_blas/Makefile.in
index e10e9f192..8c33bf26e 100755
--- a/ext/f2c_blas/Makefile.in
+++ b/ext/f2c_blas/Makefile.in
@@ -1,8 +1,8 @@
 #/bin/sh
 #/bin/sh
 #
-# $Revision: 1.10 $
-# $Date: 2009/01/12 19:34:14 $
+# $Revision$
+# $Date$
 #
 
 .SUFFIXES :
diff --git a/ext/f2c_lapack/Makefile.in b/ext/f2c_lapack/Makefile.in
index 732ad0f0d..f85c8c20a 100755
--- a/ext/f2c_lapack/Makefile.in
+++ b/ext/f2c_lapack/Makefile.in
@@ -1,9 +1,9 @@
 #/bin/sh
 #
 # $Source: /cvsroot/cantera/cantera/ext/f2c_lapack/Makefile.in,v $
-# $Author: hkmoffa $
-# $Revision: 1.9 $
-# $Date: 2009/01/12 19:34:14 $
+# $Author$
+# $Revision$
+# $Date$
 #
 
 .SUFFIXES :
diff --git a/ext/f2c_libs/Makefile.in b/ext/f2c_libs/Makefile.in
index 708e973f2..714b7a4b0 100755
--- a/ext/f2c_libs/Makefile.in
+++ b/ext/f2c_libs/Makefile.in
@@ -1,8 +1,8 @@
 #
 # $Source: /cvsroot/cantera/cantera/ext/f2c_libs/Makefile.in,v $
-# $Author: dggoodwin $
-# $Revision: 1.13 $
-# $Date: 2008/02/05 23:36:13 $
+# $Author$
+# $Revision$
+# $Date$
 #
 # Unix makefile: see README.
 # For C++, first "make hadd".
diff --git a/ext/f2c_math/Makefile.in b/ext/f2c_math/Makefile.in
index 35ead9668..5c74cc4bf 100644
--- a/ext/f2c_math/Makefile.in
+++ b/ext/f2c_math/Makefile.in
@@ -1,9 +1,9 @@
 #/bin/sh
 #
 # $Source: /cvsroot/cantera/cantera/ext/f2c_math/Makefile.in,v $
-# $Author: hkmoffa $
-# $Revision: 1.10 $
-# $Date: 2008/12/30 21:49:42 $
+# $Author$
+# $Revision$
+# $Date$
 #
 
 .SUFFIXES :
diff --git a/ext/f2c_recipes/Makefile.in b/ext/f2c_recipes/Makefile.in
index daaf914a0..1ed83b9d8 100644
--- a/ext/f2c_recipes/Makefile.in
+++ b/ext/f2c_recipes/Makefile.in
@@ -1,9 +1,9 @@
 #/bin/sh
 #
 # $Source: /cvsroot/cantera/cantera/ext/f2c_recipes/Makefile.in,v $
-# $Author: hkmoffa $
-# $Revision: 1.5 $
-# $Date: 2008/12/30 21:49:42 $
+# $Author$
+# $Revision$
+# $Date$
 #
 
 .SUFFIXES :
diff --git a/ext/lapack/Makefile.in b/ext/lapack/Makefile.in
index ce5e6e97e..48b38590c 100755
--- a/ext/lapack/Makefile.in
+++ b/ext/lapack/Makefile.in
@@ -1,5 +1,5 @@
 # $License$
-# $Id: Makefile.in,v 1.10 2008/12/30 21:58:10 hkmoffa Exp $
+# $Id$
 #
 #/bin/sh
 
diff --git a/ext/math/Makefile.in b/ext/math/Makefile.in
index aba77e6e2..4fdfdb9a3 100755
--- a/ext/math/Makefile.in
+++ b/ext/math/Makefile.in
@@ -1,8 +1,8 @@
 #
 # $Source: /cvsroot/cantera/cantera/ext/math/Makefile.in,v $
-# $Author: hkmoffa $
-# $Revision: 1.13 $
-# $Date: 2008/12/30 21:58:10 $
+# $Author$
+# $Revision$
+# $Date$
 #
 
 .SUFFIXES :
diff --git a/ext/recipes/Makefile.in b/ext/recipes/Makefile.in
index dc81b0417..54f8922fb 100755
--- a/ext/recipes/Makefile.in
+++ b/ext/recipes/Makefile.in
@@ -1,6 +1,6 @@
 # $License$
 #
-# $Id: Makefile.in,v 1.8 2008/12/30 21:49:42 hkmoffa Exp $
+# $Id$
 #
 #/bin/sh
 .SUFFIXES :
diff --git a/ext/tpx/Makefile.in b/ext/tpx/Makefile.in
index bf0ebca96..3284b2a74 100755
--- a/ext/tpx/Makefile.in
+++ b/ext/tpx/Makefile.in
@@ -1,6 +1,6 @@
 #/bin/sh
 #
-# $Id: Makefile.in,v 1.17 2009/03/28 19:10:17 hkmoffa Exp $
+# $Id$
 #
 .SUFFIXES :
 .SUFFIXES : .cpp .d .o
diff --git a/test_problems/ChemEquil_gri_matrix/gri_matrix.cpp b/test_problems/ChemEquil_gri_matrix/gri_matrix.cpp
index 4a5176c6b..8b016a734 100644
--- a/test_problems/ChemEquil_gri_matrix/gri_matrix.cpp
+++ b/test_problems/ChemEquil_gri_matrix/gri_matrix.cpp
@@ -1,7 +1,7 @@
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/02/16 21:41:06 $
- *  $Revision: 1.5 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp b/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp
index 3e14cd6d2..ac6090ae3 100644
--- a/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp
+++ b/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp
@@ -1,7 +1,7 @@
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/02/16 21:40:10 $
- *  $Revision: 1.3 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp b/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
index b5e836263..bcfa933b6 100644
--- a/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
+++ b/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
@@ -1,7 +1,7 @@
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/02/16 21:43:06 $
- *  $Revision: 1.5 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  * 
  */
diff --git a/test_problems/ChemEquil_red1/basopt_red1.cpp b/test_problems/ChemEquil_red1/basopt_red1.cpp
index 3630cbaca..7c9bea129 100644
--- a/test_problems/ChemEquil_red1/basopt_red1.cpp
+++ b/test_problems/ChemEquil_red1/basopt_red1.cpp
@@ -1,7 +1,7 @@
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/02/16 21:44:47 $
- *  $Revision: 1.5 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  */
 
diff --git a/test_problems/CpJump/CpJump.cpp b/test_problems/CpJump/CpJump.cpp
index 0081d69f2..dd5205d2a 100644
--- a/test_problems/CpJump/CpJump.cpp
+++ b/test_problems/CpJump/CpJump.cpp
@@ -1,7 +1,7 @@
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/02/16 21:46:15 $
- *  $Revision: 1.2 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/test_problems/Makefile.in b/test_problems/Makefile.in
index b2c381ba2..16b923a8f 100644
--- a/test_problems/Makefile.in
+++ b/test_problems/Makefile.in
@@ -1,7 +1,7 @@
 #
-# $Revision: 1.36 $
-# $Author: hkmoffa $
-# $Date: 2009/03/25 01:03:05 $
+# $Revision$
+# $Author$
+# $Date$
 #
 #
 test_python=@BUILD_PYTHON@
diff --git a/test_problems/VCSnonideal/Makefile.in b/test_problems/VCSnonideal/Makefile.in
index 704cb03d3..f5ea312c3 100644
--- a/test_problems/VCSnonideal/Makefile.in
+++ b/test_problems/VCSnonideal/Makefile.in
@@ -1,7 +1,7 @@
 #
-# $Revision: 1.1 $
-# $Author: hkmoffa $
-# $Date: 2007/12/20 23:47:41 $
+# $Revision$
+# $Author$
+# $Date$
 #
 #
 test_vcs_nonideal=@COMPILE_VCSNONIDEAL@
diff --git a/test_problems/VCSnonideal/NaCl_equil/HMW_NaCl.xml b/test_problems/VCSnonideal/NaCl_equil/HMW_NaCl.xml
index 59c471cf9..75cbc0e7f 100644
--- a/test_problems/VCSnonideal/NaCl_equil/HMW_NaCl.xml
+++ b/test_problems/VCSnonideal/NaCl_equil/HMW_NaCl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    $Id: HMW_NaCl.xml,v 1.3 2009/01/11 21:42:22 hkmoffa Exp $
+    $Id$
     $Source: /cvsroot/cantera/cantera/test_problems/VCSnonideal/NaCl_equil/HMW_NaCl.xml,v $
     $Name:  $
 
diff --git a/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp b/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp
index de88f1ebd..30f10e1f6 100644
--- a/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp
+++ b/test_problems/VCSnonideal/NaCl_equil/nacl_equil.cpp
@@ -1,7 +1,7 @@
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/10/31 15:43:57 $
- *  $Revision: 1.4 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/test_problems/VPsilane_test/silane_equil.cpp b/test_problems/VPsilane_test/silane_equil.cpp
index cead069de..39dad3445 100644
--- a/test_problems/VPsilane_test/silane_equil.cpp
+++ b/test_problems/VPsilane_test/silane_equil.cpp
@@ -1,8 +1,8 @@
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2009/03/14 00:51:16 $
- *  $Revision: 1.2 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
index 9a14df659..16717cd90 100644
--- a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/17 17:31:12 $
- *  $Revision: 1.5 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #ifdef SRCDIRTREE
diff --git a/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp
index 52fe873fb..16717cd90 100644
--- a/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/17 17:31:12 $
- *  $Revision: 1.3 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #ifdef SRCDIRTREE
diff --git a/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp
index 52fe873fb..16717cd90 100644
--- a/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/17 17:31:12 $
- *  $Revision: 1.3 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #ifdef SRCDIRTREE
diff --git a/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp
index 52fe873fb..16717cd90 100644
--- a/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/17 17:31:12 $
- *  $Revision: 1.3 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #ifdef SRCDIRTREE
diff --git a/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp
index 52fe873fb..16717cd90 100644
--- a/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/17 17:31:12 $
- *  $Revision: 1.3 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #ifdef SRCDIRTREE
diff --git a/test_problems/cathermo/HMW_dupl_test/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_dupl_test/HMW_NaCl_sp1977_alt.xml
index a55eccfee..feff14dee 100644
--- a/test_problems/cathermo/HMW_dupl_test/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_dupl_test/HMW_NaCl_sp1977_alt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    $Id: HMW_NaCl_sp1977_alt.xml,v 1.3 2009/01/11 21:42:22 hkmoffa Exp $
+    $Id$
     $Source: /cvsroot/cantera/cantera/test_problems/cathermo/HMW_dupl_test/HMW_NaCl_sp1977_alt.xml,v $
     $Name:  $
 
diff --git a/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp b/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
index bd10b9ae1..84665e681 100644
--- a/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
+++ b/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/17 17:31:12 $
- *  $Revision: 1.3 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #ifdef SRCDIRTREE
diff --git a/test_problems/cathermo/HMW_dupl_test/TemperatureTable.h b/test_problems/cathermo/HMW_dupl_test/TemperatureTable.h
index 49ca060cd..70cb2bf56 100644
--- a/test_problems/cathermo/HMW_dupl_test/TemperatureTable.h
+++ b/test_problems/cathermo/HMW_dupl_test/TemperatureTable.h
@@ -1,5 +1,5 @@
 /*
- * $Id: TemperatureTable.h,v 1.1 2007/06/02 00:14:25 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_dupl_test/sortAlgorithms.cpp b/test_problems/cathermo/HMW_dupl_test/sortAlgorithms.cpp
index 49f38726e..d97e51b40 100644
--- a/test_problems/cathermo/HMW_dupl_test/sortAlgorithms.cpp
+++ b/test_problems/cathermo/HMW_dupl_test/sortAlgorithms.cpp
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2007/06/02 00:14:25 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_dupl_test/sortAlgorithms.h b/test_problems/cathermo/HMW_dupl_test/sortAlgorithms.h
index 312a76e59..72a7fc2a2 100644
--- a/test_problems/cathermo/HMW_dupl_test/sortAlgorithms.h
+++ b/test_problems/cathermo/HMW_dupl_test/sortAlgorithms.h
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2007/06/02 00:14:25 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml
index d4887bb2b..279a73904 100644
--- a/test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    $Id: HMW_NaCl_sp1977_alt.xml,v 1.5 2009/01/11 21:42:22 hkmoffa Exp $
+    $Id$
     $Source: /cvsroot/cantera/cantera/test_problems/cathermo/HMW_graph_CpvT/HMW_NaCl_sp1977_alt.xml,v $
     $Name:  $
 
diff --git a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
index e8ecab23d..ae879bb25 100755
--- a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
+++ b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/17 17:31:12 $
- *  $Revision: 1.5 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #ifdef SRCDIRTREE
diff --git a/test_problems/cathermo/HMW_graph_CpvT/TemperatureTable.h b/test_problems/cathermo/HMW_graph_CpvT/TemperatureTable.h
index 29008af90..70cb2bf56 100644
--- a/test_problems/cathermo/HMW_graph_CpvT/TemperatureTable.h
+++ b/test_problems/cathermo/HMW_graph_CpvT/TemperatureTable.h
@@ -1,5 +1,5 @@
 /*
- * $Id: TemperatureTable.h,v 1.1 2006/07/06 21:00:19 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_CpvT/sortAlgorithms.cpp b/test_problems/cathermo/HMW_graph_CpvT/sortAlgorithms.cpp
index 2287137e2..d97e51b40 100644
--- a/test_problems/cathermo/HMW_graph_CpvT/sortAlgorithms.cpp
+++ b/test_problems/cathermo/HMW_graph_CpvT/sortAlgorithms.cpp
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2006/07/06 21:00:19 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_CpvT/sortAlgorithms.h b/test_problems/cathermo/HMW_graph_CpvT/sortAlgorithms.h
index 9a5ccdb5a..72a7fc2a2 100644
--- a/test_problems/cathermo/HMW_graph_CpvT/sortAlgorithms.h
+++ b/test_problems/cathermo/HMW_graph_CpvT/sortAlgorithms.h
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2006/07/06 21:00:19 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml b/test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml
index 960df5ebc..ef9ba0845 100644
--- a/test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml
+++ b/test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    $Id: HMW_NaCl.xml,v 1.5 2009/01/11 21:42:22 hkmoffa Exp $
+    $Id$
     $Source: /cvsroot/cantera/cantera/test_problems/cathermo/HMW_graph_GvI/HMW_NaCl.xml,v $
     $Name:  $
 
diff --git a/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp b/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
index 772975c77..c58e27964 100644
--- a/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
+++ b/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/30 21:49:42 $
- *  $Revision: 1.5 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 
diff --git a/test_problems/cathermo/HMW_graph_GvI/TemperatureTable.h b/test_problems/cathermo/HMW_graph_GvI/TemperatureTable.h
index 59f2b9e67..70cb2bf56 100644
--- a/test_problems/cathermo/HMW_graph_GvI/TemperatureTable.h
+++ b/test_problems/cathermo/HMW_graph_GvI/TemperatureTable.h
@@ -1,5 +1,5 @@
 /*
- * $Id: TemperatureTable.h,v 1.1 2006/07/06 21:13:39 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_GvI/sortAlgorithms.cpp b/test_problems/cathermo/HMW_graph_GvI/sortAlgorithms.cpp
index db4f179b4..d97e51b40 100644
--- a/test_problems/cathermo/HMW_graph_GvI/sortAlgorithms.cpp
+++ b/test_problems/cathermo/HMW_graph_GvI/sortAlgorithms.cpp
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2006/07/06 21:13:39 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_GvI/sortAlgorithms.h b/test_problems/cathermo/HMW_graph_GvI/sortAlgorithms.h
index dabd8fab5..72a7fc2a2 100644
--- a/test_problems/cathermo/HMW_graph_GvI/sortAlgorithms.h
+++ b/test_problems/cathermo/HMW_graph_GvI/sortAlgorithms.h
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2006/07/06 21:13:39 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml
index 77fe3f5ea..a7db1af74 100644
--- a/test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    $Id: HMW_NaCl_sp1977_alt.xml,v 1.5 2009/01/11 21:42:22 hkmoffa Exp $
+    $Id$
     $Source: /cvsroot/cantera/cantera/test_problems/cathermo/HMW_graph_GvT/HMW_NaCl_sp1977_alt.xml,v $
     $Name:  $
 
diff --git a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
index 7e662a540..b41a61106 100644
--- a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
+++ b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/17 17:31:12 $
- *  $Revision: 1.5 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #ifdef SRCDIRTREE
diff --git a/test_problems/cathermo/HMW_graph_GvT/TemperatureTable.h b/test_problems/cathermo/HMW_graph_GvT/TemperatureTable.h
index c4e72a58f..70cb2bf56 100644
--- a/test_problems/cathermo/HMW_graph_GvT/TemperatureTable.h
+++ b/test_problems/cathermo/HMW_graph_GvT/TemperatureTable.h
@@ -1,5 +1,5 @@
 /*
- * $Id: TemperatureTable.h,v 1.1 2006/07/06 15:56:20 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_GvT/sortAlgorithms.cpp b/test_problems/cathermo/HMW_graph_GvT/sortAlgorithms.cpp
index d4ae77b1e..d97e51b40 100644
--- a/test_problems/cathermo/HMW_graph_GvT/sortAlgorithms.cpp
+++ b/test_problems/cathermo/HMW_graph_GvT/sortAlgorithms.cpp
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2006/07/06 15:56:20 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_GvT/sortAlgorithms.h b/test_problems/cathermo/HMW_graph_GvT/sortAlgorithms.h
index 6d80900ae..72a7fc2a2 100644
--- a/test_problems/cathermo/HMW_graph_GvT/sortAlgorithms.h
+++ b/test_problems/cathermo/HMW_graph_GvT/sortAlgorithms.h
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2006/07/06 15:56:20 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml
index 1dc74c92e..c44106fd5 100644
--- a/test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    $Id: HMW_NaCl_sp1977_alt.xml,v 1.5 2009/01/11 21:42:22 hkmoffa Exp $
+    $Id$
     $Source: /cvsroot/cantera/cantera/test_problems/cathermo/HMW_graph_HvT/HMW_NaCl_sp1977_alt.xml,v $
     $Name:  $
 
diff --git a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
index dc017c290..15de6a268 100644
--- a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
+++ b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/17 17:31:12 $
- *  $Revision: 1.6 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #include "Cantera.h"
diff --git a/test_problems/cathermo/HMW_graph_HvT/TemperatureTable.h b/test_problems/cathermo/HMW_graph_HvT/TemperatureTable.h
index 8039d05f9..70cb2bf56 100644
--- a/test_problems/cathermo/HMW_graph_HvT/TemperatureTable.h
+++ b/test_problems/cathermo/HMW_graph_HvT/TemperatureTable.h
@@ -1,5 +1,5 @@
 /*
- * $Id: TemperatureTable.h,v 1.1 2006/07/06 20:13:38 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_HvT/sortAlgorithms.cpp b/test_problems/cathermo/HMW_graph_HvT/sortAlgorithms.cpp
index 446a9f946..d97e51b40 100644
--- a/test_problems/cathermo/HMW_graph_HvT/sortAlgorithms.cpp
+++ b/test_problems/cathermo/HMW_graph_HvT/sortAlgorithms.cpp
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2006/07/06 20:13:38 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_HvT/sortAlgorithms.h b/test_problems/cathermo/HMW_graph_HvT/sortAlgorithms.h
index 0059e53a2..72a7fc2a2 100644
--- a/test_problems/cathermo/HMW_graph_HvT/sortAlgorithms.h
+++ b/test_problems/cathermo/HMW_graph_HvT/sortAlgorithms.h
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2006/07/06 20:13:38 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml b/test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml
index bd690dbc9..74ad2b436 100644
--- a/test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml
+++ b/test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    $Id: HMW_NaCl_sp1977_alt.xml,v 1.5 2009/01/11 21:42:22 hkmoffa Exp $
+    $Id$
     $Source: /cvsroot/cantera/cantera/test_problems/cathermo/HMW_graph_VvT/HMW_NaCl_sp1977_alt.xml,v $
     $Name:  $
 
diff --git a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
index 8e0a62845..c4ebc6008 100755
--- a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
+++ b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
@@ -3,9 +3,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/17 17:31:12 $
- *  $Revision: 1.8 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #ifdef SRCDIRTREE
diff --git a/test_problems/cathermo/HMW_graph_VvT/TemperatureTable.h b/test_problems/cathermo/HMW_graph_VvT/TemperatureTable.h
index 033a6d4f8..70cb2bf56 100644
--- a/test_problems/cathermo/HMW_graph_VvT/TemperatureTable.h
+++ b/test_problems/cathermo/HMW_graph_VvT/TemperatureTable.h
@@ -1,5 +1,5 @@
 /*
- * $Id: TemperatureTable.h,v 1.1 2006/07/06 21:12:53 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_VvT/sortAlgorithms.cpp b/test_problems/cathermo/HMW_graph_VvT/sortAlgorithms.cpp
index ed02505f3..d97e51b40 100644
--- a/test_problems/cathermo/HMW_graph_VvT/sortAlgorithms.cpp
+++ b/test_problems/cathermo/HMW_graph_VvT/sortAlgorithms.cpp
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2006/07/06 21:12:53 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_graph_VvT/sortAlgorithms.h b/test_problems/cathermo/HMW_graph_VvT/sortAlgorithms.h
index eb2665090..72a7fc2a2 100644
--- a/test_problems/cathermo/HMW_graph_VvT/sortAlgorithms.h
+++ b/test_problems/cathermo/HMW_graph_VvT/sortAlgorithms.h
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2006/07/06 21:12:53 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
index 7f6646d14..e426384e7 100644
--- a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
+++ b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
@@ -1,8 +1,8 @@
 /* ======================================================================= */
 /* $RCSfile: HMW_test_1.cpp,v $ */
-/* $Author: hkmoffa $ */
-/* $Date: 2008/12/17 17:31:12 $ */
-/* $Revision: 1.8 $ */
+/* $Author$ */
+/* $Date$ */
+/* $Revision$ */
 /* ======================================================================= */
 
 
diff --git a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
index 7e8a75bb1..237bd66ba 100644
--- a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
+++ b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
@@ -1,8 +1,8 @@
 /* ======================================================================= */
 /* $RCSfile: HMW_test_3.cpp,v $ */
-/* $Author: hkmoffa $ */
-/* $Date: 2008/12/17 17:31:12 $ */
-/* $Revision: 1.6 $ */
+/* $Author$ */
+/* $Date$ */
+/* $Revision$ */
 /* ======================================================================= */
 
 
diff --git a/test_problems/cathermo/Makefile.in b/test_problems/cathermo/Makefile.in
index 1f539f61f..027228701 100644
--- a/test_problems/cathermo/Makefile.in
+++ b/test_problems/cathermo/Makefile.in
@@ -1,7 +1,7 @@
 #
-# $Revision: 1.18 $
-# $Author: hkmoffa $
-# $Date: 2008/08/23 01:16:43 $
+# $Revision$
+# $Author$
+# $Date$
 #
 #
 test_issp=@COMPILE_IDEAL_SOLUTIONS@
diff --git a/test_problems/cathermo/VPissp/ISSPTester.cpp b/test_problems/cathermo/VPissp/ISSPTester.cpp
index a6686a90f..9e55800db 100644
--- a/test_problems/cathermo/VPissp/ISSPTester.cpp
+++ b/test_problems/cathermo/VPissp/ISSPTester.cpp
@@ -1,7 +1,7 @@
 /**
  *  @file ISSPTester.cpp
  *
- *  $Id: ISSPTester.cpp,v 1.2 2008/12/17 17:31:12 hkmoffa Exp $
+ *  $Id$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/ims/IMSTester.cpp b/test_problems/cathermo/ims/IMSTester.cpp
index 57fb56c11..18b0b0d0c 100644
--- a/test_problems/cathermo/ims/IMSTester.cpp
+++ b/test_problems/cathermo/ims/IMSTester.cpp
@@ -1,7 +1,7 @@
 /**
  *  @file IMSTester.cpp
  *
- *  $Id: IMSTester.cpp,v 1.3 2008/12/17 17:31:12 hkmoffa Exp $
+ *  $Id$
  */
 /*
  * Copywrite 2005 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/issp/ISSPTester.cpp b/test_problems/cathermo/issp/ISSPTester.cpp
index bfa2ecaf6..1d875a10e 100644
--- a/test_problems/cathermo/issp/ISSPTester.cpp
+++ b/test_problems/cathermo/issp/ISSPTester.cpp
@@ -1,7 +1,7 @@
 /**
  *  @file ISSPTester.cpp
  *
- *  $Id: ISSPTester.cpp,v 1.3 2008/12/17 17:31:12 hkmoffa Exp $
+ *  $Id$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/stoichSubSSTP/TemperatureTable.h b/test_problems/cathermo/stoichSubSSTP/TemperatureTable.h
index f75f83735..70cb2bf56 100644
--- a/test_problems/cathermo/stoichSubSSTP/TemperatureTable.h
+++ b/test_problems/cathermo/stoichSubSSTP/TemperatureTable.h
@@ -1,5 +1,5 @@
 /*
- * $Id: TemperatureTable.h,v 1.1 2007/02/28 03:00:53 hkmoffa Exp $
+ * $Id$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/stoichSubSSTP/sortAlgorithms.cpp b/test_problems/cathermo/stoichSubSSTP/sortAlgorithms.cpp
index 9e38b6915..d97e51b40 100644
--- a/test_problems/cathermo/stoichSubSSTP/sortAlgorithms.cpp
+++ b/test_problems/cathermo/stoichSubSSTP/sortAlgorithms.cpp
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2007/02/28 03:00:53 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/stoichSubSSTP/sortAlgorithms.h b/test_problems/cathermo/stoichSubSSTP/sortAlgorithms.h
index 7a6779545..72a7fc2a2 100644
--- a/test_problems/cathermo/stoichSubSSTP/sortAlgorithms.h
+++ b/test_problems/cathermo/stoichSubSSTP/sortAlgorithms.h
@@ -1,9 +1,9 @@
 /*
  * @file sortAlgorithms.h
  *
- * $Author: hkmoffa $
- * $Revision: 1.1 $
- * $Date: 2007/02/28 03:00:53 $
+ * $Author$
+ * $Revision$
+ * $Date$
  */
 /*
  * Copywrite 2004 Sandia Corporation. Under the terms of Contract
diff --git a/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp b/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
index 609f26dd4..b7d15fb78 100644
--- a/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
+++ b/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
@@ -4,9 +4,9 @@
  */
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/12/17 17:31:13 $
- *  $Revision: 1.3 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  */
 
 #ifdef SRCDIRTREE
diff --git a/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp b/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp
index e41c86332..7e630a470 100644
--- a/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp
+++ b/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: testIAPWSphi.cpp,v 1.2 2008/12/17 17:31:13 hkmoffa Exp $
+ * $Id$
  */
 #include "WaterPropsIAPWSphi.h"
 #include <new>
diff --git a/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp b/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp
index f3f99a65f..975961487 100644
--- a/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp
+++ b/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: testWaterPDSS.cpp,v 1.6 2008/12/17 17:31:13 hkmoffa Exp $
+ * $Id$
  */
 #include "ct_defs.h"
 #include "ctexceptions.h"
diff --git a/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp b/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
index 332dc4a4c..a5681c8be 100644
--- a/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
+++ b/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: testWaterSSTP.cpp,v 1.5 2008/12/17 17:31:13 hkmoffa Exp $
+ * $Id$
  */
 
 #include "Cantera.h"
diff --git a/test_problems/cathermo/wtWater/wtWater.cpp b/test_problems/cathermo/wtWater/wtWater.cpp
index 953f91cc8..584e53a8d 100644
--- a/test_problems/cathermo/wtWater/wtWater.cpp
+++ b/test_problems/cathermo/wtWater/wtWater.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: testWaterPDSS.cpp,v 1.6 2008/12/17 17:31:13 hkmoffa Exp $
+ * $Id$
  */
 #include "ct_defs.h"
 #include "ctexceptions.h"
diff --git a/test_problems/ck2cti_test/Makefile.in b/test_problems/ck2cti_test/Makefile.in
index 7c29bc16f..ef75eba35 100644
--- a/test_problems/ck2cti_test/Makefile.in
+++ b/test_problems/ck2cti_test/Makefile.in
@@ -1,7 +1,7 @@
 #
-# $Revision: 1.2 $
-# $Author: hkmoffa $
-# $Date: 2004/07/29 22:14:56 $
+# $Revision$
+# $Author$
+# $Date$
 #
 #
 all:
diff --git a/test_problems/ck2cti_test/runtest.in b/test_problems/ck2cti_test/runtest.in
index bea593e4d..723ef5237 100755
--- a/test_problems/ck2cti_test/runtest.in
+++ b/test_problems/ck2cti_test/runtest.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: runtest.in,v 1.7 2006/03/03 15:33:56 hkmoffa Exp $
+# $Id$
 #
 echo " "
 echo "***************************************************"
diff --git a/test_problems/cxx_ex/Makefile.in b/test_problems/cxx_ex/Makefile.in
index d8a9a77be..cff1beeef 100644
--- a/test_problems/cxx_ex/Makefile.in
+++ b/test_problems/cxx_ex/Makefile.in
@@ -1,7 +1,7 @@
 #
-# $Revision: 1.7 $
-# $Author: hkmoffa $
-# $Date: 2006/04/30 18:06:56 $
+# $Revision$
+# $Author$
+# $Date$
 #
 #
 all:
diff --git a/test_problems/cxx_ex/runtest b/test_problems/cxx_ex/runtest
index 31337b945..083c7c849 100755
--- a/test_problems/cxx_ex/runtest
+++ b/test_problems/cxx_ex/runtest
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: runtest,v 1.8 2006/08/14 19:32:55 hkmoffa Exp $
+# $Id$
 #
 temp_success="1"
 /bin/rm  -f eq1.csv  tr1.csv tr2.csv  kin1.csv  kin2.csv \
diff --git a/test_problems/min_python/Makefile.in b/test_problems/min_python/Makefile.in
index b9fe3dffc..6046d6f33 100644
--- a/test_problems/min_python/Makefile.in
+++ b/test_problems/min_python/Makefile.in
@@ -1,7 +1,7 @@
 #
-# $Revision: 1.4 $
-# $Author: hkmoffa $
-# $Date: 2009/07/13 16:51:56 $
+# $Revision$
+# $Author$
+# $Date$
 #
 #
 test_python=@BUILD_PYTHON@
diff --git a/test_problems/min_python/negATest/negATest.cpp b/test_problems/min_python/negATest/negATest.cpp
index 0d8977136..8dc1736cd 100644
--- a/test_problems/min_python/negATest/negATest.cpp
+++ b/test_problems/min_python/negATest/negATest.cpp
@@ -1,8 +1,8 @@
 
 /*
- *  $Author: dggoodwin $
- *  $Date: 2007/05/04 15:18:45 $
- *  $Revision: 1.3 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
 
  */
diff --git a/test_problems/nasa9_reader/Makefile.in b/test_problems/nasa9_reader/Makefile.in
index 13c5104ab..ef75eba35 100644
--- a/test_problems/nasa9_reader/Makefile.in
+++ b/test_problems/nasa9_reader/Makefile.in
@@ -1,7 +1,7 @@
 #
-# $Revision: 1.1 $
-# $Author: hkmoffa $
-# $Date: 2007/09/13 15:12:46 $
+# $Revision$
+# $Author$
+# $Date$
 #
 #
 all:
diff --git a/test_problems/nasa9_reader/runtest.in b/test_problems/nasa9_reader/runtest.in
index 2811d162e..b95043b55 100755
--- a/test_problems/nasa9_reader/runtest.in
+++ b/test_problems/nasa9_reader/runtest.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: runtest.in,v 1.1 2007/09/13 15:12:46 hkmoffa Exp $
+# $Id$
 #
 echo " "
 echo "***************************************************"
diff --git a/test_problems/negATest/negATest.cpp b/test_problems/negATest/negATest.cpp
index 259863387..c1bb929d2 100644
--- a/test_problems/negATest/negATest.cpp
+++ b/test_problems/negATest/negATest.cpp
@@ -1,8 +1,8 @@
 
 /*
- *  $Author: dggoodwin $
- *  $Date: 2007/05/04 15:18:45 $
- *  $Revision: 1.3 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
 
  */
diff --git a/test_problems/printUtilUnitTest/pUtest.cpp b/test_problems/printUtilUnitTest/pUtest.cpp
index 59b59a5dc..ee01e5c93 100644
--- a/test_problems/printUtilUnitTest/pUtest.cpp
+++ b/test_problems/printUtilUnitTest/pUtest.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: pUtest.cpp,v 1.1 2009/03/25 00:17:06 hkmoffa Exp $
+ * $Id$
  */
 #include <iostream>
 #include <fstream>
diff --git a/test_problems/pureFluidTest/testPureWater.cpp b/test_problems/pureFluidTest/testPureWater.cpp
index a63d48214..4c3dc15ff 100644
--- a/test_problems/pureFluidTest/testPureWater.cpp
+++ b/test_problems/pureFluidTest/testPureWater.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: testPureWater.cpp,v 1.3 2008/12/17 17:17:09 hkmoffa Exp $
+ * $Id$
  */
 #include "PureFluid.h"
 #include <new>
diff --git a/test_problems/silane_equil/silane_equil.cpp b/test_problems/silane_equil/silane_equil.cpp
index 2ac713394..9b5514174 100644
--- a/test_problems/silane_equil/silane_equil.cpp
+++ b/test_problems/silane_equil/silane_equil.cpp
@@ -1,8 +1,8 @@
 
 /*
- *  $Author: hkmoffa $
- *  $Date: 2008/08/23 00:55:58 $
- *  $Revision: 1.10 $
+ *  $Author$
+ *  $Date$
+ *  $Revision$
  *
  *  Copyright 2002 California Institute of Technology
  *
diff --git a/test_problems/surfkin/surfdemo.cpp b/test_problems/surfkin/surfdemo.cpp
index 3a1b525e0..316fb6c9f 100644
--- a/test_problems/surfkin/surfdemo.cpp
+++ b/test_problems/surfkin/surfdemo.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: surfdemo.cpp,v 1.11 2008/01/09 13:43:26 dggoodwin Exp $
+ * $Id$
  *
  *  Sample program that solves an implicit problem for surface
  *  site fractions.
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 839919dc3..287cddbd2 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,7 +1,7 @@
 #
-# $Revision: 1.13 $
-# $Author: hkmoffa $
-# $Date: 2008/09/08 23:56:40 $
+# $Revision$
+# $Author$
+# $Date$
 #
 build_ck=@BUILD_CK@
 
diff --git a/tools/bin/cvs2cl.pl b/tools/bin/cvs2cl.pl
index b6792e5a0..4f7c97bc9 100755
--- a/tools/bin/cvs2cl.pl
+++ b/tools/bin/cvs2cl.pl
@@ -9,9 +9,9 @@ exec perl -w -x $0 ${1+"$@"} # -*- mode: perl; perl-indent-level: 2; -*-
 ###                                                        ###
 ##############################################################
 
-## $Revision: 1.2 $
-## $Date: 2004/12/13 14:58:11 $
-## $Author: dggoodwin $
+## $Revision$
+## $Date$
+## $Author$
 ##
 
 use strict;
@@ -143,7 +143,7 @@ use User::pwent    qw( getpwnam );
 # Globals --------------------------------------------------------------------
 
 # In case we have to print it out:
-my $VERSION = '$Revision: 1.2 $';
+my $VERSION = '$Revision$';
 $VERSION =~ s/\S+\s+(\S+)\s+\S+/$1/;
 
 ## Vars set by options:
diff --git a/tools/doc/Makefile.in b/tools/doc/Makefile.in
index 7a300e892..68bcabb1a 100644
--- a/tools/doc/Makefile.in
+++ b/tools/doc/Makefile.in
@@ -1,7 +1,7 @@
 #
-# $Revision: 1.2 $
-# $Author: hkmoffa $
-# $Date: 2006/07/25 16:52:52 $
+# $Revision$
+# $Author$
+# $Date$
 #
 build_ck=@BUILD_CK@
 
diff --git a/tools/src/ck2cti.cpp b/tools/src/ck2cti.cpp
index 75768663a..04b9dc114 100644
--- a/tools/src/ck2cti.cpp
+++ b/tools/src/ck2cti.cpp
@@ -1,6 +1,6 @@
 /**
  * @file ck2cti.cpp
- * $Id: ck2cti.cpp,v 1.8 2008/01/03 18:53:37 hkmoffa Exp $
+ * $Id$
  *
  * Program to convert Chemkin-II-format reaction mechanism files to
  * Cantera input format. The resulting Cantera input file contains a
diff --git a/tools/testtools/csvdiff.cpp b/tools/testtools/csvdiff.cpp
index af25e6c32..fd03fb734 100644
--- a/tools/testtools/csvdiff.cpp
+++ b/tools/testtools/csvdiff.cpp
@@ -3,9 +3,9 @@
  * | CVS File Information | 
  * ------------------------
  * $RCSfile: csvdiff.cpp,v $
- * $Author: hkmoffa $
- * $Date: 2008/01/03 18:54:23 $
- * $Revision: 1.17 $
+ * $Author$
+ * $Date$
+ * $Revision$
  * $Name:  $
  *====================================================================*/
 /*
@@ -719,7 +719,7 @@ int main(int argc, char *argv[])
   printf("\n");
   printf("----------------------------------------------------------\n");
   printf("csvdiff: CSVFile comparison utility program\n");
-  printf("         Version $Revision: 1.17 $\n");
+  printf("         Version $Revision$\n");
   printf("         Harry K. Moffat Div. 9114 Sandia National Labs\n");
   printf("         \n");
   printf("         First  CSV File = %s\n", fileName1);
diff --git a/tools/testtools/mdp_allo.cpp b/tools/testtools/mdp_allo.cpp
index 9dd00d61e..4c60e2d7b 100644
--- a/tools/testtools/mdp_allo.cpp
+++ b/tools/testtools/mdp_allo.cpp
@@ -1,9 +1,9 @@
 /*
 ******************************************************************************
 * $RCSfile: mdp_allo.cpp,v $
-* $Author: hkmoffa $
-* $Date: 2009/04/19 02:31:12 $
-* $Revision: 1.6 $
+* $Author$
+* $Date$
+* $Revision$
 * $Name:  $
 ******************************************************************************
 */
diff --git a/tools/testtools/mdp_allo.h b/tools/testtools/mdp_allo.h
index 1132ea571..cdf23dd11 100644
--- a/tools/testtools/mdp_allo.h
+++ b/tools/testtools/mdp_allo.h
@@ -5,11 +5,11 @@
  *
  * $RCSfile: mdp_allo.h,v $
  *
- * $Author: hkmoffa $
+ * $Author$
  *
- * $Date: 2007/03/26 21:53:45 $
+ * $Date$
  *
- * $Revision: 1.3 $
+ * $Revision$
  *
  * $Name:  $
  *====================================================================*/
diff --git a/tools/testtools/tok_input_util.cpp b/tools/testtools/tok_input_util.cpp
index 406f1519b..c481a2c29 100644
--- a/tools/testtools/tok_input_util.cpp
+++ b/tools/testtools/tok_input_util.cpp
@@ -5,14 +5,14 @@
  *
  * $RCSfile: tok_input_util.cpp,v $
  *
- * $Author: hkmoffa $
+ * $Author$
  *
- * $Date: 2009/03/28 03:07:23 $
+ * $Date$
  *
- * $Revision: 1.2 $
+ * $Revision$
  * Symbolic $Name:  $
  *
- * $Id: tok_input_util.cpp,v 1.2 2009/03/28 03:07:23 hkmoffa Exp $
+ * $Id$
  * $Source: /cvsroot/cantera/cantera/tools/testtools/tok_input_util.cpp,v $
  *
  *====================================================================*/
diff --git a/tools/testtools/tok_input_util.h b/tools/testtools/tok_input_util.h
index 07f7662e5..32ff823b3 100644
--- a/tools/testtools/tok_input_util.h
+++ b/tools/testtools/tok_input_util.h
@@ -5,14 +5,14 @@
  *
  * $RCSfile: tok_input_util.h,v $
  *
- * $Author: dggoodwin $
+ * $Author$
  *
- * $Date: 2003/04/14 17:58:00 $
+ * $Date$
  *
- * $Revision: 1.1.1.1 $
+ * $Revision$
  * Symbolic $Name:  $
  *
- * $Id: tok_input_util.h,v 1.1.1.1 2003/04/14 17:58:00 dggoodwin Exp $
+ * $Id$
  * $Source: /cvsroot/cantera/cantera/tools/testtools/tok_input_util.h,v $
  *
  *
diff --git a/win32/vc7/Sundials/sundials/sundials_config.h b/win32/vc7/Sundials/sundials/sundials_config.h
index 4dd4c912a..12850b2d3 100644
--- a/win32/vc7/Sundials/sundials/sundials_config.h
+++ b/win32/vc7/Sundials/sundials/sundials_config.h
@@ -1,7 +1,7 @@
 /*
  * -----------------------------------------------------------------
- * $Revision: 1.1 $
- * $Date: 2006/11/13 19:46:18 $
+ * $Revision$
+ * $Date$
  * ----------------------------------------------------------------- 
  * Programmer(s): Aaron Collier @ LLNL
  * -----------------------------------------------------------------
diff --git a/win32/vc9/Sundials/SUNDIALS_SHARED/sundials_config.h b/win32/vc9/Sundials/SUNDIALS_SHARED/sundials_config.h
index 5c01366ae..4f1d80e33 100644
--- a/win32/vc9/Sundials/SUNDIALS_SHARED/sundials_config.h
+++ b/win32/vc9/Sundials/SUNDIALS_SHARED/sundials_config.h
@@ -1,7 +1,7 @@
 /*
  * -----------------------------------------------------------------
- * $Revision: 1.1 $
- * $Date: 2009/07/20 20:44:03 $
+ * $Revision$
+ * $Date$
  * ----------------------------------------------------------------- 
  * Programmer(s): Aaron Collier @ LLNL
  * -----------------------------------------------------------------