Merge pull request #1193 from tnm/patch-1

Make sure the log standardizes on 'timeout'
This commit is contained in:
Salvatore Sanfilippo 2013-07-12 14:12:04 -07:00
commit 34e2065830