Merge from head.
authorSteve Reinhardt <stever@eecs.umich.edu>
Sat, 14 Jul 2007 19:23:47 +0000 (12:23 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sat, 14 Jul 2007 19:23:47 +0000 (12:23 -0700)
commit288f9cf7d24d506a0776405000e04ede6fa38384
tree4de3e459d00cc6f1985279128674b2d1ba211fd3
parenta51e16dc89ecd24b168fbb4677ca05ab0a7bcc02
parente5ecfa27455a8be97429e9f88e8e6582b9819c6f
Merge from head.

--HG--
extra : convert_revision : f7b3700762b796d44f99aef05783db1ee9c7412e