saltstack/salt — pull request #5358 by cvrebert (2013-06-01 02:56:34+00:00)
Title: avoid shadowing comment() func in file mod

Also optimize comment string construction.