merge regression updates
authorKorey Sewell <ksewell@umich.edu>
Mon, 20 Jun 2011 22:58:31 +0000 (18:58 -0400)
committerKorey Sewell <ksewell@umich.edu>
Mon, 20 Jun 2011 22:58:31 +0000 (18:58 -0400)

Trivial merge