Merge branch 'master' of ecbaldwin.net:/home/cnb/dvl/backup/
authorAlan Jack Pippin <ajp@pippin.(none)>
Mon, 7 Nov 2005 16:57:11 +0000 (09:57 -0700)
committerAlan Jack Pippin <ajp@pippin.(none)>
Mon, 7 Nov 2005 16:57:11 +0000 (09:57 -0700)

Trivial merge