Merge branch 'master' of moltke.seatribe.se:src/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 15 Jan 2011 04:26:22 +0000 (05:26 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 15 Jan 2011 04:26:22 +0000 (05:26 +0100)

Trivial merge