Merge.
authorGabe Black <gblack@eecs.umich.edu>
Thu, 6 May 2010 20:41:33 +0000 (13:41 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 6 May 2010 20:41:33 +0000 (13:41 -0700)

Trivial merge