Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 5 Aug 2009 10:12:39 +0000 (03:12 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 5 Aug 2009 10:12:39 +0000 (03:12 -0700)
commit60d4a0f6d7328b251797b14c33fd6766b95bc1ea
tree4bc10256a2c14de46f3c1b722f983a32607b8095
parentda2df2fc251440d0dbd91864d74ba94a2153ca5e
parentbd7af84d5ecd037fe4ab1a66948c51d23eb0eb0d
Merge with head.