Merge from upstream
authorAaron Bentley <abentley@panoramicfeedback.com>
Mon, 6 Feb 2006 18:04:17 +0000 (13:04 -0500)
committerAaron Bentley <abentley@panoramicfeedback.com>
Mon, 6 Feb 2006 18:04:17 +0000 (13:04 -0500)

Trivial merge