Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Tue, 21 Aug 2007 23:19:46 +0000 (16:19 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 21 Aug 2007 23:19:46 +0000 (16:19 -0700)
--HG--
extra : convert_revision : 9ef81afcfabd86c9c069204998c987344f03f33e


Trivial merge