Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 1 Aug 2007 19:02:59 +0000 (12:02 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 1 Aug 2007 19:02:59 +0000 (12:02 -0700)
commit7da3a8e65cf800c2a779440c997aad1422e68d77
tree785b01bdb224ac3c17c6699dd1cde01f8599f868
parentc1fa2b156bb67fc593bdccd7b1561529bfc32a2e
parenta4a5e6bc2e7d8e5912917706105b1d9f527a2135
Merge with head.

--HG--
extra : convert_revision : 5bc1133c6c7a575082f060e7787b62d4080f70b0