Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Sun, 23 Aug 2009 21:19:14 +0000 (14:19 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 23 Aug 2009 21:19:14 +0000 (14:19 -0700)

Trivial merge