Merge from panometrics
authorAaron Bentley <aaron.bentley@utoronto.ca>
Sun, 15 Jul 2007 16:43:30 +0000 (12:43 -0400)
committerAaron Bentley <aaron.bentley@utoronto.ca>
Sun, 15 Jul 2007 16:43:30 +0000 (12:43 -0400)

Trivial merge