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)
commit3fd291bc4ec0934f51137f1ba1f253f7093c2d88
treec9495003db2c04529c8d69f7a71a47046683075c
parent3110b157e6890273561c6bc3ff407e298e8d910d
parent0896b5b8974a79afd98ef08f69d21626ef9adf21
merge Ali's config change...

--HG--
extra : convert_revision : ada34ebc392d84f1225b4ff3e25f353396aa102f