Merge from Trevor.
authorChris Ball <cjb@laptop.org>
Tue, 22 Jun 2010 19:57:58 +0000 (15:57 -0400)
committerChris Ball <cjb@laptop.org>
Tue, 22 Jun 2010 19:57:58 +0000 (15:57 -0400)

Trivial merge