Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 22 Jan 2013 23:03:56 +0000 (18:03 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 22 Jan 2013 23:03:56 +0000 (18:03 -0500)

Trivial merge