Merge branch 'bug409' of git://github.com/Pike/buildbot