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)
commit70e0c1963e5f83b0a6ab2aa139e1a8f30aa25c56
tree16ae46d4458ab73068474b5f23b4d51c8deed35a
parent91f4887d1b19c44d68a2b19f0abee56de3dbb8ea
parent6a7c3f175b210cc16d09a5e8e4c1d47333dbe1c6
Merge commit 'upstream/0.3'