Merged with Gabe's recent changes.
authorNilay Vaish <nilay@cs.wisc.edu>
Sun, 3 Jul 2011 16:38:25 +0000 (11:38 -0500)
committerNilay Vaish <nilay@cs.wisc.edu>
Sun, 3 Jul 2011 16:38:25 +0000 (11:38 -0500)

Trivial merge