Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 1 Aug 2007 23:00:33 +0000 (16:00 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 1 Aug 2007 23:00:33 +0000 (16:00 -0700)
--HG--
extra : convert_revision : 646d559a10706521b1918d2378d0f99ab5255c77


Trivial merge