Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 28 Oct 2009 16:15:59 +0000 (17:15 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 28 Oct 2009 16:15:59 +0000 (17:15 +0100)

Trivial merge