Merge branch 'master' into jython
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 31 Aug 2012 05:56:35 +0000 (07:56 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 31 Aug 2012 05:56:35 +0000 (07:56 +0200)

Trivial merge