From: Chris Ball <cjb@laptop.org>
Date: Tue, 22 Jun 2010 16:11:36 +0000 (-0400)
Subject: Merge with Trevor
X-Git-Tag: 1.0.0~58
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c91e05c4211ea94d513b2024719c6ee27b5d6dab;p=be.git

Merge with Trevor
---

c91e05c4211ea94d513b2024719c6ee27b5d6dab