Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Mon, 17 Aug 2009 07:21:57 +0000 (00:21 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 17 Aug 2009 07:21:57 +0000 (00:21 -0700)

Trivial merge