Merge branch 'bzr_puller_fix' of git://github.com/knielsen/buildbot