Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Sun, 27 Jan 2013 02:11:36 +0000 (21:11 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Sun, 27 Jan 2013 02:11:36 +0000 (21:11 -0500)

Trivial merge