Merge commit 'dkg/master'
authorJamie McClelland <jm@mayfirst.org>
Sat, 6 Sep 2008 06:59:12 +0000 (02:59 -0400)
committerJamie McClelland <jm@mayfirst.org>
Sat, 6 Sep 2008 06:59:12 +0000 (02:59 -0400)

Trivial merge