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

Trivial merge