Merge branch 'use-logobserver-2' of git://github.com/djmitche/buildbot