Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Tue, 24 Jul 2007 22:48:40 +0000 (15:48 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 24 Jul 2007 22:48:40 +0000 (15:48 -0700)
--HG--
extra : convert_revision : 4a34b3f91c4fc90055596245ae3efec45ea33888


Trivial merge