Merge branch 'master' of /users/gdcosta/posters
authorMichael Spang <mspang@uwaterloo.ca>
Sat, 30 Jun 2007 10:42:49 +0000 (06:42 -0400)
committerMichael Spang <mspang@uwaterloo.ca>
Sat, 30 Jun 2007 10:42:49 +0000 (06:42 -0400)

Trivial merge