Merge branch 'master' of caffeine:/users/www/www/
authorDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Sun, 7 Oct 2007 11:48:54 +0000 (07:48 -0400)
committerDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Sun, 7 Oct 2007 11:48:54 +0000 (07:48 -0400)

Trivial merge