Merge branch '1.0.x'
authorKshitij Bansal <kshitij@cs.nyu.edu>
Fri, 15 Feb 2013 22:21:00 +0000 (17:21 -0500)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Fri, 15 Feb 2013 22:21:00 +0000 (17:21 -0500)

Trivial merge