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)
commit9eda6f7d59fbcc4bb5c9779df85aa1a0b189565c
treea1a4b02792b2cce1186e2b82d992e3541f2a7c61
parent7d396b1bf6f281c1bfae991e41d7e3c359d88854
parentb25aea90e53a923b2b23bff4b9bc15c3169680d6
Merge with head.

--HG--
extra : convert_revision : 3ed25e91776b025238ba9e77fe43e957ecc99bc7