Merge remaining fixes from Zwart
authorAaron Bentley <aaron.bentley@utoronto.ca>
Fri, 7 Apr 2006 02:17:23 +0000 (22:17 -0400)
committerAaron Bentley <aaron.bentley@utoronto.ca>
Fri, 7 Apr 2006 02:17:23 +0000 (22:17 -0400)

Trivial merge