Merge from other BE
authorAaron Bentley <aaron.bentley@utoronto.ca>
Mon, 17 Apr 2006 22:12:29 +0000 (18:12 -0400)
committerAaron Bentley <aaron.bentley@utoronto.ca>
Mon, 17 Apr 2006 22:12:29 +0000 (18:12 -0400)

Trivial merge