Merge commit 'refs/merge-requests/4' of git://gitorious.org/be/be
authorChris Ball <cjb@laptop.org>
Tue, 22 Feb 2011 15:06:10 +0000 (10:06 -0500)
committerChris Ball <cjb@laptop.org>
Tue, 22 Feb 2011 15:06:10 +0000 (10:06 -0500)

Trivial merge