Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 18 Dec 2012 20:52:13 +0000 (15:52 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 18 Dec 2012 20:52:13 +0000 (15:52 -0500)

Trivial merge