Merge with head
authorGabe Black <gblack@eecs.umich.edu>
Sat, 13 Oct 2007 03:10:57 +0000 (20:10 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Sat, 13 Oct 2007 03:10:57 +0000 (20:10 -0700)
--HG--
extra : convert_revision : 490f9909469751a6cdaf6669e4cd4589ce3a4093


Trivial merge