Merge branch 'master' into jython
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 28 Aug 2012 00:59:09 +0000 (02:59 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 28 Aug 2012 00:59:09 +0000 (02:59 +0200)

Trivial merge