Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Fri, 19 Oct 2007 05:44:33 +0000 (22:44 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 19 Oct 2007 05:44:33 +0000 (22:44 -0700)
--HG--
extra : convert_revision : 7a1c612e7f64fc6b35749547d744e919e034e66f


Trivial merge