Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 1 Feb 2009 06:57:21 +0000 (01:57 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 1 Feb 2009 06:57:21 +0000 (01:57 -0500)

Trivial merge