Merge with the head.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 11 Nov 2009 05:12:53 +0000 (21:12 -0800)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 11 Nov 2009 05:12:53 +0000 (21:12 -0800)
commit850eb54a7c3408b887a0f6663c021fd61f227204
tree5412bd92b00a61c4e622819d9b823589b9c5e4a8
parentb8120f6c38f212acbfd246a3081842a9e3d06eb3
parent2e28da5583814efe1e0a09718f6a674f983d12d1
Merge with the head.