Merge branch 'master' of caffeine:/users/www/www
authorMatthew McPherrin <mimcpher@csclub.uwaterloo.ca>
Fri, 28 Jan 2011 08:05:24 +0000 (03:05 -0500)
committerMatthew McPherrin <mimcpher@csclub.uwaterloo.ca>
Fri, 28 Jan 2011 08:05:24 +0000 (03:05 -0500)

Trivial merge