Thomas Kluyver - 2009-07-30

Updated patch (supersedes previous)