Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Sun, 23 Aug 2009 21:19:14 +0000 (14:19 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 23 Aug 2009 21:19:14 +0000 (14:19 -0700)
commite251b42c59ba112357eb8f1d841fc162b284d83e
tree30d2ae800106235282e8336188046a8f30e235c2
parentd0d597004f01ca475c16d5385353e58d3f1f689a
parent890be773623adaa40af90933fcdb5abc717eb742
Merge with head.