Merge commit 'upstream/0.5'
authorDiane Trout <diane@caltech.edu>
Thu, 21 Jul 2011 21:16:36 +0000 (14:16 -0700)
committerDiane Trout <diane@caltech.edu>
Thu, 21 Jul 2011 21:16:36 +0000 (14:16 -0700)

Trivial merge