Merge branch 'master' of https://git.gnus.org/gnus
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Wed, 22 Jun 2011 14:47:03 +0000 (16:47 +0200)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Wed, 22 Jun 2011 14:47:03 +0000 (16:47 +0200)

Trivial merge