Fix for slightly garbled hand merge
authorGabe Black <gblack@eecs.umich.edu>
Tue, 23 Jan 2007 07:38:17 +0000 (23:38 -0800)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 23 Jan 2007 07:38:17 +0000 (23:38 -0800)
commit08501b5a352ed82d1563a2529cdba17807dae1c5
treed7c797f46cd00cc76628a4a65329f2f2dd966cbe
parent1352e55ceb2d78a9a36451636b672cd6daf8550e
Fix for slightly garbled hand merge

--HG--
extra : convert_revision : f9be59e94311571d91b6793b1caa1b6136ef864c