From: Chris Ball <cjb@laptop.org>
Date: Thu, 24 Jun 2010 22:58:03 +0000 (-0400)
Subject: Merge branch 'cfbe'
X-Git-Tag: 1.0.0~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a461eec26dd3abae18f33df8de7c7185b678e00f;p=be.git

Merge branch 'cfbe'
---

a461eec26dd3abae18f33df8de7c7185b678e00f