Commit due to merge.
authorNilay Vaish <nilay@cs.wisc.edu>
Sun, 30 Oct 2011 20:57:39 +0000 (15:57 -0500)
committerNilay Vaish <nilay@cs.wisc.edu>
Sun, 30 Oct 2011 20:57:39 +0000 (15:57 -0500)

Trivial merge