Merge branch 'bug388' of git://github.com/nhemingway/buildbot