Merging stuff from ecbaldwin.net
authorAlan Jack Pippin <ajp@pippin.(none)>
Sat, 12 Nov 2005 21:49:28 +0000 (14:49 -0700)
committerAlan Jack Pippin <ajp@pippin.(none)>
Sat, 12 Nov 2005 21:49:28 +0000 (14:49 -0700)

Trivial merge