Merge in upstream changes from 0.97.7
authorjohn <john@movingsucks.org>
Fri, 23 Nov 2007 20:56:33 +0000 (13:56 -0700)
committerjohn <john@movingsucks.org>
Fri, 23 Nov 2007 20:56:33 +0000 (13:56 -0700)
commita1e35e181538fbf39007c699312691a8330ca418
tree9037d7b19bd8a56bb11522adf439bb22720aa48d
parentadfba0402927438a1869f1e716bcf0e25574ce1e
parent272acf7fcf7e6786ab0c06ab4047a7a56da91682
Merge in upstream changes from 0.97.7