Merge commit 'refs/merge-requests/2' of git://gitorious.org/be/be
authorChris Ball <cjb@laptop.org>
Fri, 25 Jun 2010 19:55:14 +0000 (15:55 -0400)
committerChris Ball <cjb@laptop.org>
Fri, 25 Jun 2010 19:55:14 +0000 (15:55 -0400)

Trivial merge