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)
commitae52bd5946df9c0d59be43824b20d33819891f93
treec4579ec93a80f5e93b4258e8771ae39405ce9ba7
parent1f746ca3f2f2745bfeae998186b4a427776359a2
parenteeaf13d7d9c5e6fcad4689c988d4fc1806426d3f
Merge with W. Trevor King's tree.