merge Ali's config change...
authorKorey Sewell <ksewell@umich.edu>
Thu, 15 Nov 2007 19:21:42 +0000 (14:21 -0500)
committerKorey Sewell <ksewell@umich.edu>
Thu, 15 Nov 2007 19:21:42 +0000 (14:21 -0500)
--HG--
extra : convert_revision : ada34ebc392d84f1225b4ff3e25f353396aa102f


Trivial merge