Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 1 Aug 2007 22:54:25 +0000 (15:54 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 1 Aug 2007 22:54:25 +0000 (15:54 -0700)
commit458dfc8b3edc716a7587f3ad7516e6d667e0572e
tree5cafd01451dd3ea32269277af818a57c3e18ea2d
parentc032a535ab651f216ef0620915ab90338ca24929
parent84cd78e96f892f52a715cfe10d9405987f5e9ba1
Merge with head.

--HG--
extra : convert_revision : f677debfd636d79bc5097eb45331601d3253743d