Merge remote branch 'origin/no-gnus'
authorLars Magne Ingebrigtsen <larsi@stories.(none)>
Sat, 25 Feb 2012 11:30:08 +0000 (12:30 +0100)
committerLars Magne Ingebrigtsen <larsi@stories.(none)>
Sat, 25 Feb 2012 11:30:08 +0000 (12:30 +0100)

Trivial merge