saltstack/salt — pull request #2109 by s0undt3ch (2012-09-27 11:09:20+00:00)
Title: Fix #2087 and #2098

Fix #2087 and #2098