Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Mon, 22 Oct 2007 21:40:21 +0000 (14:40 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 22 Oct 2007 21:40:21 +0000 (14:40 -0700)
--HG--
extra : convert_revision : 3ed25e91776b025238ba9e77fe43e957ecc99bc7


Trivial merge