Merge branch 'master' of ecbaldwin.net:/home/cnb/dvl/backup/
authorAlan Jack Pippin <ajp@pippin.(none)>
Sat, 12 Nov 2005 21:50:21 +0000 (14:50 -0700)
committerAlan Jack Pippin <ajp@pippin.(none)>
Sat, 12 Nov 2005 21:50:21 +0000 (14:50 -0700)

Trivial merge