saltstack/salt — pull request #4743 by cvrebert (2013-05-02 07:36:15+00:00)
Title: simplify / style-tweak conditionals in __init__.py-s

Semi-arbitrary chunk. Chunking these changes to not deviate too far from your code churn guidelines.