saltstack/salt — pull request #5858 by cvrebert (2013-07-01 23:01:01+00:00)
Title: git_pillar: fix/cleanup imports

* add missing imports
* rm unused imports
* improve organization of imports
* rename local var to avoid shadowing