fix error code parsing.
Merge branch 'master' of https://github.com/jonnyyu/buildbot

Conflicts:
	slave/buildslave/commands/fs.py