Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 5 Feb 2013 21:39:30 +0000 (16:39 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 5 Feb 2013 21:39:30 +0000 (16:39 -0500)

Trivial merge