Merge commit 'origin/master'
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 19 Oct 2008 15:49:50 +0000 (17:49 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 19 Oct 2008 15:49:50 +0000 (17:49 +0200)

Trivial merge