Merge commit 'dkg/master'
authorJamie McClelland <jm@mayfirst.org>
Tue, 16 Sep 2008 14:01:58 +0000 (10:01 -0400)
committerJamie McClelland <jm@mayfirst.org>
Tue, 16 Sep 2008 14:01:58 +0000 (10:01 -0400)

Trivial merge