Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 26 Sep 2007 03:11:41 +0000 (20:11 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 26 Sep 2007 03:11:41 +0000 (20:11 -0700)
--HG--
extra : convert_revision : f331b9cbd82086d63d4f35e18f9e08466c016225


Trivial merge