merged upstream
authorAaron Bentley <abentley@panoramicfeedback.com>
Thu, 26 Jan 2006 15:58:06 +0000 (10:58 -0500)
committerAaron Bentley <abentley@panoramicfeedback.com>
Thu, 26 Jan 2006 15:58:06 +0000 (10:58 -0500)

Trivial merge