Merge branch 'master' of caffeine:/users/www/www/
authorDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Sat, 6 Oct 2007 21:04:22 +0000 (17:04 -0400)
committerDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Sat, 6 Oct 2007 21:04:22 +0000 (17:04 -0400)

Trivial merge