# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1399016346 -7200
# Node ID 7e193663b0d6b466f205a48e275fc803d348f5b3
# Parent  3b0bcc658eefe5a37bc22c3ba21629f421ec3a9d# Parent  8d921a12dd31552d4d8b2fe3038b82400dfde79d
Merge with stable

diff -r 3b0bcc658eef -r 7e193663b0d6 tests/killdaemons.py
--- a/tests/killdaemons.py	Mon Apr 14 13:21:25 2014 +0100
+++ b/tests/killdaemons.py	Fri May 02 09:39:06 2014 +0200
@@ -43,7 +43,7 @@
             elif r == WAIT_TIMEOUT:
                 logfn('# Daemon process %d is stuck')
             else:
-                check(r) # any error
+                _check(r) # any error
         except: #re-raises
             ctypes.windll.kernel32.CloseHandle(handle) # no _check, keep error
             raise