Merge branch 'madness'
authorDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Fri, 21 Sep 2007 01:06:43 +0000 (21:06 -0400)
committerDavid Bartley <dtbartle@csclub.uwaterloo.ca>
Fri, 21 Sep 2007 01:06:43 +0000 (21:06 -0400)

Trivial merge