Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 15 Jul 2009 01:06:30 +0000 (18:06 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 15 Jul 2009 01:06:30 +0000 (18:06 -0700)
commit6262b31515020ab62cd51b382c0184a34d290d4d
treef97a801f59c95a78cf80032d8ee0ea5edc03da74
parentfce4412d76481f0e60b1611349fe49bfe8110ee9
parent100da6b3267b4e3d6834cd872502b8303d289d17
Merge with head.