Merge be --version code from W. Trevor King.
authorChris Ball <cjb@laptop.org>
Thu, 25 Jun 2009 17:44:27 +0000 (13:44 -0400)
committerChris Ball <cjb@laptop.org>
Thu, 25 Jun 2009 17:44:27 +0000 (13:44 -0400)

Trivial merge