Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 5 Sep 2007 06:46:08 +0000 (23:46 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 5 Sep 2007 06:46:08 +0000 (23:46 -0700)
--HG--
extra : convert_revision : 19bea7995285eeb7e277d3064f427429ade2bcb8


Trivial merge