Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Thu, 4 Oct 2007 19:35:35 +0000 (12:35 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 4 Oct 2007 19:35:35 +0000 (12:35 -0700)
--HG--
extra : convert_revision : aa1969b60044f8ed88e689bdd25eeded2b1105ec


Trivial merge