Merge commit 'pubserv/master'
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 13 Oct 2007 19:06:35 +0000 (21:06 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 13 Oct 2007 19:06:35 +0000 (21:06 +0200)

Trivial merge