saltstack/salt — pull request #3622 by techhat (2013-02-06 19:08:13+00:00)
Title: Merging in changes from #3594

Thanks to @toddejohnson for doing the actual work on this.