saltstack/salt — pull request #8049 by holmboe (2013-10-23 15:07:47+00:00)
Title: I always have to look up these :)

My editor fixed some whitespace issues as well, the meat of this is at the end of the diff.