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)
commitbd0c3067c187d1f718004fb38acc093af8810a02
treee91bafec974068c1705534a768743a888882616b
parent1b740fc70684c92a5e2293013217d5a2fd661d8a
parentd02fe5283ed7a93a2f76a5d6dc6e37b40c11b9b1
Merge commit 'upstream/0.5'