Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 13 Oct 2009 18:07:58 +0000 (20:07 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 13 Oct 2009 18:07:58 +0000 (20:07 +0200)

Trivial merge