Merge with Trevor
authorChris Ball <cjb@laptop.org>
Tue, 22 Jun 2010 16:11:36 +0000 (12:11 -0400)
committerChris Ball <cjb@laptop.org>
Tue, 22 Jun 2010 16:11:36 +0000 (12:11 -0400)

Trivial merge