Merge with W. Trevor King's tree.
authorChris Ball <cjb@laptop.org>
Thu, 25 Jun 2009 13:53:39 +0000 (09:53 -0400)
committerChris Ball <cjb@laptop.org>
Thu, 25 Jun 2009 13:53:39 +0000 (09:53 -0400)

Trivial merge