fixup bad hand merge
authorAli Saidi <saidi@eecs.umich.edu>
Tue, 14 Aug 2007 03:45:07 +0000 (23:45 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Tue, 14 Aug 2007 03:45:07 +0000 (23:45 -0400)
commit546fbfb47cc1e79ceb91a26fb0d2c27973e2d92b
treebb9e747857b32f7f2360dce2ae181c53556b03f8
parent27ddf0b40e9b0bea1d75d825c7339c9fb9411bc9
fixup bad hand merge

--HG--
extra : convert_revision : 71db222856a811f2724bbc9bbe4069c1f61754ed
util/regress