Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 26 Sep 2007 03:11:41 +0000 (20:11 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 26 Sep 2007 03:11:41 +0000 (20:11 -0700)
commit2dd65dc2546216ef132e30f5c590e11e35b4ff37
treed64578bd2dbbc5ba41f40279c9bd762ed765677d
parent25a9b6ea5e232590240a7ffc6ff769ffdfdc1e04
parentb3c6f32543f7c7e3a2ef5d70681424fb77e64731
Merge with head.

--HG--
extra : convert_revision : f331b9cbd82086d63d4f35e18f9e08466c016225