Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Tue, 7 Aug 2007 22:31:36 +0000 (15:31 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 7 Aug 2007 22:31:36 +0000 (15:31 -0700)
--HG--
extra : convert_revision : ae7b3df573368c29a66d5b027ecad9ffb3a99104


Trivial merge