Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Tue, 14 Aug 2007 23:12:11 +0000 (16:12 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 14 Aug 2007 23:12:11 +0000 (16:12 -0700)
--HG--
extra : convert_revision : e02b606752bf1305d3609051b42a9adba009b7df


Trivial merge