Merge commit 'dkg/master'
authorJamie McClelland <jm@mayfirst.org>
Wed, 6 Aug 2008 14:24:55 +0000 (10:24 -0400)
committerJamie McClelland <jm@mayfirst.org>
Wed, 6 Aug 2008 14:24:55 +0000 (10:24 -0400)

Trivial merge