Merge.
authorGabe Black <gblack@eecs.umich.edu>
Thu, 9 Dec 2010 00:52:38 +0000 (16:52 -0800)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 9 Dec 2010 00:52:38 +0000 (16:52 -0800)

Trivial merge