Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Mon, 7 Jan 2013 07:02:46 +0000 (08:02 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Mon, 7 Jan 2013 07:02:46 +0000 (08:02 +0100)

Trivial merge