Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Thu, 2 Aug 2007 22:14:36 +0000 (15:14 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 2 Aug 2007 22:14:36 +0000 (15:14 -0700)
--HG--
extra : convert_revision : 7700f475caa676948175cdf126ee018b0c4ad35c


Trivial merge