rs/zkfarmer — pull request #11 by vincentbernat (2012-12-21 17:54:22+00:00)
Title: Miscellanous fixes

Miscellanous fixes. The first 4 commits are from the Kazoo rewrite. Once the rewrite has been merged, I will rebase those patches to make those commits disappear.