Merge pull request #3121 from Karlson2k/timeout_fix_01
authorjmarshallnz <jcmarsha@gmail.com>
Tue, 15 Oct 2013 23:34:08 +0000 (16:34 -0700)
committerjmarshallnz <jcmarsha@gmail.com>
Tue, 15 Oct 2013 23:34:08 +0000 (16:34 -0700)
Fix incorrect (non wrap safe) timeout process


Trivial merge