Merge commit 'jrollins/master'
authorJamie McClelland <jm@mayfirst.org>
Fri, 15 Aug 2008 14:15:46 +0000 (10:15 -0400)
committerJamie McClelland <jm@mayfirst.org>
Fri, 15 Aug 2008 14:15:46 +0000 (10:15 -0400)

Trivial merge