Merge commit 'dkg/master'
authorJamie McClelland <jm@mayfirst.org>
Tue, 5 Aug 2008 13:45:02 +0000 (09:45 -0400)
committerJamie McClelland <jm@mayfirst.org>
Tue, 5 Aug 2008 13:45:02 +0000 (09:45 -0400)

Trivial merge