Merge with the head.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 11 Nov 2009 05:12:53 +0000 (21:12 -0800)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 11 Nov 2009 05:12:53 +0000 (21:12 -0800)

Trivial merge