Merged with Gabe's changeset.
authorNilay Vaish <nilay@cs.wisc.edu>
Mon, 25 Jul 2011 23:31:30 +0000 (18:31 -0500)
committerNilay Vaish <nilay@cs.wisc.edu>
Mon, 25 Jul 2011 23:31:30 +0000 (18:31 -0500)

Trivial merge