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)

Trivial merge