saltstack/salt — pull request #300 by SEJeff (2011-12-01 04:55:28+00:00)
Title: Grains enhancement + a few cleanups

I've not had a chance to test all of this yet but wanted to get it all in before upstream diverges more. If you're able to test this in the morning and merge it, please do.

If not, punt it and I'll actually have more time to test it out tomorrow evening. I was pushing to get this done and all 100% tested this evening but haven't had much luck getting python zmq >= 2.1.9 running on Maverick.