Merge branch 'master' of caffeine:/users/git/public/pyceo
authorJacob Parker <j3parker@uwaterloo.ca>
Sat, 22 Aug 2009 20:16:21 +0000 (16:16 -0400)
committerJacob Parker <j3parker@uwaterloo.ca>
Sat, 22 Aug 2009 20:16:21 +0000 (16:16 -0400)

Trivial merge