Merge from upstream
authorAaron Bentley <abentley@panoramicfeedback.com>
Thu, 6 Apr 2006 16:54:06 +0000 (12:54 -0400)
committerAaron Bentley <abentley@panoramicfeedback.com>
Thu, 6 Apr 2006 16:54:06 +0000 (12:54 -0400)

Trivial merge