Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Dec 2012 21:00:03 +0000 (16:00 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Dec 2012 21:00:03 +0000 (16:00 -0500)

Trivial merge