Merge with W. Trevor King's tree.
authorChris Ball <cjb@laptop.org>
Wed, 24 Jun 2009 21:24:25 +0000 (17:24 -0400)
committerChris Ball <cjb@laptop.org>
Wed, 24 Jun 2009 21:24:25 +0000 (17:24 -0400)

Trivial merge