Merge commit 'dkg/master'
authorJamie McClelland <jm@mayfirst.org>
Tue, 5 Aug 2008 16:47:04 +0000 (12:47 -0400)
committerJamie McClelland <jm@mayfirst.org>
Tue, 5 Aug 2008 16:47:04 +0000 (12:47 -0400)

Trivial merge