Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 13 May 2012 02:12:39 +0000 (04:12 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 13 May 2012 02:12:39 +0000 (04:12 +0200)

Trivial merge