Merge commit 'dkg/master'
authorJamie McClelland <jm@mayfirst.org>
Mon, 28 Jul 2008 01:35:08 +0000 (21:35 -0400)
committerJamie McClelland <jm@mayfirst.org>
Mon, 28 Jul 2008 01:35:08 +0000 (21:35 -0400)

Trivial merge