Merge from upstream
authorAaron Bentley <abentley@panoramicfeedback.com>
Fri, 3 Feb 2006 20:52:07 +0000 (15:52 -0500)
committerAaron Bentley <abentley@panoramicfeedback.com>
Fri, 3 Feb 2006 20:52:07 +0000 (15:52 -0500)

Trivial merge