Merge pull request #430 from wolfmanjm/upstreamedge
authorJim Morris <morris@wolfman.com>
Tue, 17 Jun 2014 06:11:41 +0000 (23:11 -0700)
committerJim Morris <morris@wolfman.com>
Tue, 17 Jun 2014 06:11:41 +0000 (23:11 -0700)
fix race conditions in slowticker... thanks to raldrich for finding one ...


Trivial merge