Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Sun, 29 Jul 2007 20:53:39 +0000 (13:53 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 29 Jul 2007 20:53:39 +0000 (13:53 -0700)
commitfa86dcd1a6a11f4c48d71c9b622d5aa7129849e4
treec32d099e3d7a69f0b5214b58adcb8877bf6e73b2
parent7309d5ee45a7f6e71693c4f2582468eb591fc16a
parent362ff1bcebd78c0c247e435eac657c8a1134b1fb
Merge with head.

--HG--
extra : convert_revision : 1cf4d998699d131c3b20eef67a3c2817af0ce439