Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Thu, 31 Jan 2013 23:30:48 +0000 (18:30 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Thu, 31 Jan 2013 23:30:48 +0000 (18:30 -0500)

Trivial merge