Merge branch 'master' into python3
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 28 Nov 2012 04:51:07 +0000 (05:51 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 28 Nov 2012 04:51:07 +0000 (05:51 +0100)

Trivial merge