saltstack/salt — pull request #2303 by gcw (2012-10-20 18:27:28+00:00)
Title: conflict resolved.. 

think I mashed it out..
documentation changes merged with upstream develop

though I did it on 4 hours of sleep after having been awake for more than 20 hours.. ;-)