Merge branch 'master' of https://git.gnus.org/gnus
authorTed Zlatanov <tzz@lifelogs.com>
Mon, 7 Jun 2010 16:00:14 +0000 (11:00 -0500)
committerTed Zlatanov <tzz@lifelogs.com>
Mon, 7 Jun 2010 16:00:14 +0000 (11:00 -0500)

Trivial merge