Merge large rework from W. Trevor King.
authorChris Ball <cjb@laptop.org>
Thu, 23 Jul 2009 21:49:13 +0000 (17:49 -0400)
committerChris Ball <cjb@laptop.org>
Thu, 23 Jul 2009 21:49:13 +0000 (17:49 -0400)

Trivial merge