Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 1 Aug 2007 19:02:59 +0000 (12:02 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 1 Aug 2007 19:02:59 +0000 (12:02 -0700)
--HG--
extra : convert_revision : 5bc1133c6c7a575082f060e7787b62d4080f70b0


Trivial merge