Merge my changes
authorAaron Bentley <aaron.bentley@utoronto.ca>
Thu, 26 Jan 2006 01:37:55 +0000 (20:37 -0500)
committerAaron Bentley <aaron.bentley@utoronto.ca>
Thu, 26 Jan 2006 01:37:55 +0000 (20:37 -0500)

Trivial merge