Merged with recent changes.
authorNilay Vaish <nilay@cs.wisc.edu>
Fri, 28 Oct 2011 18:04:33 +0000 (13:04 -0500)
committerNilay Vaish <nilay@cs.wisc.edu>
Fri, 28 Oct 2011 18:04:33 +0000 (13:04 -0500)

Trivial merge