Changes by: Nathaniel Gray (n8gray at caltech.edu)
Date: 2005-09-16 15:20:16 -0700 (Fri, 16 Sep 2005)
Revision: 7711
Log message:

      resolving trivial conflict wrt my copies.