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)

Trivial merge