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

Merge from upstream
---

cf6feb832a71d5ef1a0453c1b94e72ab78836bc5