Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Tue, 20 Nov 2007 23:38:54 +0000 (15:38 -0800)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 20 Nov 2007 23:38:54 +0000 (15:38 -0800)
--HG--
extra : convert_revision : c4215e516c6d82ad466db898ffeefa0233ca110e


Trivial merge