saltstack/salt — pull request #10645 by rallytime (2014-02-21 18:18:34+00:00)
Title: Test fixes

I broke the Jenkins tests with my PR from yesterday...here are my fixes.