Merge with head.
authorGabe Black <gblack@eecs.umich.edu>
Mon, 17 Aug 2009 07:21:57 +0000 (00:21 -0700)
committerGabe Black <gblack@eecs.umich.edu>
Mon, 17 Aug 2009 07:21:57 +0000 (00:21 -0700)
commita43ae579dd3128a0ced2238532f26d99db197361
tree271a90c0fdfde8b58180ee494c528a3fbec57588
parent32c8514b450a7dda77a3963d00642fcc5de658da
parenta6b39c07d9d03955382a0e930b363c6e6fd4b942
Merge with head.