Merge commit 'remotes/pubserv/master'
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 4 Oct 2007 02:30:33 +0000 (04:30 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 4 Oct 2007 02:30:33 +0000 (04:30 +0200)

Trivial merge