Merged with head.
authorGabe Black <gblack@eecs.umich.edu>
Mon, 3 Aug 2009 18:06:19 +0000 (11:06 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 3 Aug 2009 18:06:19 +0000 (11:06 -0700)

Trivial merge