Merge branch 'master' of https://git.gnus.org/gnus
authorTed Zlatanov <tzz@lifelogs.com>
Mon, 31 Oct 2011 22:31:10 +0000 (18:31 -0400)
committerTed Zlatanov <tzz@lifelogs.com>
Mon, 31 Oct 2011 22:31:10 +0000 (18:31 -0400)

Trivial merge