Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Thu, 13 Sep 2007 23:36:25 +0000 (16:36 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 13 Sep 2007 23:36:25 +0000 (16:36 -0700)
--HG--
extra : convert_revision : 22aafb1cead3f584e64c188dc8eb45e271f4e7e9


Trivial merge