Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Fri, 3 Aug 2007 06:30:25 +0000 (23:30 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 3 Aug 2007 06:30:25 +0000 (23:30 -0700)
--HG--
extra : convert_revision : c8b066289916b3fb24bcae1e9c76e27ad4cf61b1


Trivial merge