Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Wed, 15 Jul 2009 01:06:30 +0000 (18:06 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 15 Jul 2009 01:06:30 +0000 (18:06 -0700)

Trivial merge