Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Sun, 5 Aug 2007 03:27:23 +0000 (20:27 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 5 Aug 2007 03:27:23 +0000 (20:27 -0700)
--HG--
extra : convert_revision : 3edb9f03353b18b4c9f062bccf11e79cfb3c15f2


Trivial merge