Merged with Nate's commit
authorNilay Vaish <nilay@cs.wisc.edu>
Sat, 7 Jan 2012 13:40:44 +0000 (07:40 -0600)
committerNilay Vaish <nilay@cs.wisc.edu>
Sat, 7 Jan 2012 13:40:44 +0000 (07:40 -0600)

Trivial merge