Merge branch 'master' of ssh+git://caffeine.uwaterloo.ca/srv/git/public/pyceo
authorMichael Gregson <mgregson@csclub.uwaterloo.ca>
Fri, 25 Jul 2008 04:08:58 +0000 (22:08 -0600)
committerMichael Gregson <mgregson@csclub.uwaterloo.ca>
Fri, 25 Jul 2008 04:08:58 +0000 (22:08 -0600)

Trivial merge