Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 8 Mar 2011 06:06:11 +0000 (07:06 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 8 Mar 2011 06:06:11 +0000 (07:06 +0100)

Trivial merge