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)
commit08c1a6f41b3d74b5bf388c05efbd99c1b79b3bfe
tree4a27b86453461828df96f999ec34738e2eee47b2
parentb5736ba4ef3ae82238c7c9811e182c8a13a58fdd
parent9124f4658770d2401e74cd321542635f27f82c00
merge regression updates