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

Merge from Trevor.
---

9763adba687a0e8921187702dd55e9a7083c9db4