Merge branch 'myfixes' of git://github.com/cpeyer/buildbot