Merge commit 'upstream/0.3.1'
authorDiane Trout <diane@caltech.edu>
Fri, 19 Nov 2010 20:28:25 +0000 (12:28 -0800)
committerDiane Trout <diane@caltech.edu>
Fri, 19 Nov 2010 20:28:25 +0000 (12:28 -0800)

Trivial merge