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)
commit908a879d4d549f8812b2ffaff18c2d77a8f2ee96
tree887dc42668bacb90ee8578a61846055b5f0f0603
parenta0ad744604dc622d97095e04457ba00b3bc1561a
parent0b0359632461e45fcda1510d2562d6c17eedc45b
Merge commit 'refs/merge-requests/4' of git://gitorious.org/be/be