Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc
authorFredrik Tolf <fredrik@dolda2000.com>
Mon, 19 Oct 2009 13:40:24 +0000 (15:40 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Mon, 19 Oct 2009 13:40:24 +0000 (15:40 +0200)

Trivial merge