Merge branch '1.0.x'
authorDejan Jovanović <dejan@cs.nyu.edu>
Sat, 22 Dec 2012 00:14:45 +0000 (19:14 -0500)
committerDejan Jovanović <dejan@cs.nyu.edu>
Sat, 22 Dec 2012 00:14:45 +0000 (19:14 -0500)

Trivial merge