Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Sun, 5 Aug 2007 03:27:23 +0000 (20:27 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 5 Aug 2007 03:27:23 +0000 (20:27 -0700)
commitcae8d20633c0f43fdae23576adfb894284a7ee86
treee9e232684d7fc024900d8a07d6b8a3add1f52e92
parent30e777a5d3829975266ecccac965d2297a5f4985
parentdf015f17a45b18302565c43d3790d787e1b54c42
Merge with head.

--HG--
extra : convert_revision : 3edb9f03353b18b4c9f062bccf11e79cfb3c15f2