Merge commit 'upstream/0.3'
authorDiane Trout <diane@caltech.edu>
Fri, 19 Nov 2010 19:43:44 +0000 (11:43 -0800)
committerDiane Trout <diane@caltech.edu>
Fri, 19 Nov 2010 19:43:44 +0000 (11:43 -0800)

Trivial merge