Merge branch 'seezer'
authorManuel Nickschas <sputnick@quassel-irc.org>
Tue, 1 Jul 2008 18:14:39 +0000 (20:14 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Tue, 1 Jul 2008 18:14:39 +0000 (20:14 +0200)

Trivial merge