Merge branch 'master' of caffeine:/users/www/www
authorMichael Gregson <mgregson@csclub.uwaterloo.ca>
Sun, 27 Jan 2008 23:12:55 +0000 (18:12 -0500)
committerMichael Gregson <mgregson@csclub.uwaterloo.ca>
Sun, 27 Jan 2008 23:12:55 +0000 (18:12 -0500)

Trivial merge