Merge branch 'master' into jython
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 16 Nov 2012 00:46:04 +0000 (01:46 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 16 Nov 2012 00:46:04 +0000 (01:46 +0100)

Trivial merge