saltstack/salt — pull request #4970 by s0undt3ch (2013-05-10 12:19:05+00:00)
Title: Work around built-in shadowing not taken into account in 5f71be3

Work around built-in shadowing not taken into account in 5f71be39a5b9bebe32b87c868416abe0fc548211