Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Tue, 18 Aug 2009 05:39:10 +0000 (22:39 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 18 Aug 2009 05:39:10 +0000 (22:39 -0700)

Trivial merge