saltstack/salt — pull request #354 by SEJeff (2011-12-13 06:19:44+00:00)
Title: Misc cleanups

Fix gh-138 by allowing modules to have their own top level __init__(). This blew up on stuff such as the grains/__init__.py, so it is wrapped in a try/except.

I'm not sure if this is the way you intended to implement this feature, but in my limited testing, it does what I think needs to be done. This also fixes a small typo found in the master log.