saltstack/salt — pull request #2768 by s0undt3ch (2012-12-01 23:02:06+00:00)
Title: Fix #2731 + Testcase + Some other fixes.

Fix #2731 + Testcase + Some other fixes.