Merge branch 'master' of ssh://csclub.uwaterloo.ca/users/git/www/www
authorEdgar Bering <ebering@csclub.uwaterloo.ca>
Wed, 3 Nov 2010 19:33:40 +0000 (15:33 -0400)
committerEdgar Bering <ebering@csclub.uwaterloo.ca>
Wed, 3 Nov 2010 19:33:40 +0000 (15:33 -0400)

Trivial merge