Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Thu, 6 Sep 2007 23:32:03 +0000 (16:32 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 6 Sep 2007 23:32:03 +0000 (16:32 -0700)
--HG--
extra : convert_revision : 4fc5f595b23f72c0825d62f21efab46ed1db835b


Trivial merge