Merge 'master' into 'psppsheet'.
authorBen Pfaff <blp@cs.stanford.edu>
Sun, 3 Feb 2013 20:16:49 +0000 (12:16 -0800)
committerBen Pfaff <blp@cs.stanford.edu>
Sun, 3 Feb 2013 20:16:49 +0000 (12:16 -0800)

Trivial merge