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)
commitd99caee28aaad87750571542f20bec2de091d5a0
treeccefde44dbd41d1a469f42828a5176fbcfbc9290
parent665e64fbe8fea91f68be42cbbda79082d9a58c30
parent37195a33108299504f8d37042dec06df0540d0d2
Merge with W. Trevor King's tree.