From: Aaron Bentley <abentley@panoramicfeedback.com>
Date: Fri, 3 Feb 2006 20:52:07 +0000 (-0500)
Subject: Merge from upstream
X-Git-Tag: 1.0.0~218^2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a9e110fe90d4b65bbfe74c1819ba46b394ded23d;p=be.git

Merge from upstream
---

a9e110fe90d4b65bbfe74c1819ba46b394ded23d