Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Sat, 19 Jan 2013 16:28:10 +0000 (11:28 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Sat, 19 Jan 2013 16:28:10 +0000 (11:28 -0500)

Trivial merge