Merge branch 'cfbe'
authorChris Ball <cjb@laptop.org>
Thu, 24 Jun 2010 22:58:03 +0000 (18:58 -0400)
committerChris Ball <cjb@laptop.org>
Thu, 24 Jun 2010 22:58:03 +0000 (18:58 -0400)

Trivial merge