Changes by: Jason J. Hickey (jyh at cs.caltech.edu)
Date: 2007-09-30 08:46:52 -0700 (Sun, 30 Sep 2007)
Revision: 12266
Log message:

      Some temporary fixes to get "everything" working.
     These aren't done the right way.  I'll have to see about unblocking
     the merge on var3.