Merge up to alan's release
authorCarl N Baldwin <cnb@plane.localdomain>
Sun, 27 Nov 2005 00:30:51 +0000 (17:30 -0700)
committerCarl N Baldwin <cnb@plane.localdomain>
Sun, 27 Nov 2005 00:30:51 +0000 (17:30 -0700)

Trivial merge