Merge branch 'master' of home:dvl/backup
authorCarl N Baldwin <cnb@plane.(none)>
Tue, 18 Oct 2005 02:46:22 +0000 (20:46 -0600)
committerCarl N Baldwin <cnb@plane.(none)>
Tue, 18 Oct 2005 02:46:22 +0000 (20:46 -0600)

Trivial merge