Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 5 Aug 2012 16:18:42 +0000 (18:18 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 5 Aug 2012 16:18:42 +0000 (18:18 +0200)

Trivial merge