Merge branch 'master' of caffeine:/users/www/www
authorDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Fri, 20 Feb 2009 01:14:57 +0000 (20:14 -0500)
committerDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Fri, 20 Feb 2009 01:14:57 +0000 (20:14 -0500)

Trivial merge