Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 5 Feb 2012 17:36:55 +0000 (18:36 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 5 Feb 2012 17:36:55 +0000 (18:36 +0100)

Trivial merge