Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Fri, 27 Jul 2007 05:13:48 +0000 (22:13 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 27 Jul 2007 05:13:48 +0000 (22:13 -0700)
--HG--
extra : convert_revision : e4be9d5f2ce8e3252958e2c5e03710b0bf9755c7


Trivial merge