Merge commit 'dkg/master'
authorJamie McClelland <jm@mayfirst.org>
Wed, 3 Sep 2008 16:27:44 +0000 (12:27 -0400)
committerJamie McClelland <jm@mayfirst.org>
Wed, 3 Sep 2008 16:27:44 +0000 (12:27 -0400)

Trivial merge