Merge remote-tracking branch 'main-repo/1.0.x' into 1.0.x
authorTim King <taking@cs.nyu.edu>
Sat, 15 Dec 2012 01:13:53 +0000 (20:13 -0500)
committerTim King <taking@cs.nyu.edu>
Sat, 15 Dec 2012 01:13:53 +0000 (20:13 -0500)

Trivial merge