Merge commit 'public/master'
authorMichael Spang <mspang@csclub.uwaterloo.ca>
Wed, 5 Aug 2009 06:24:01 +0000 (02:24 -0400)
committerMichael Spang <mspang@csclub.uwaterloo.ca>
Wed, 5 Aug 2009 06:24:01 +0000 (02:24 -0400)

Trivial merge