Merge with vlock-2-timeout
commit12fb56ba01161c3fe111a636e48179ddf47c1734
authorFrank Benkstein <frank-vlock@benkstein.net>
Fri, 10 Aug 2007 11:50:41 +0000 (10 13:50 +0200)
committerFrank Benkstein <frank-vlock@benkstein.net>
Fri, 10 Aug 2007 11:50:41 +0000 (10 13:50 +0200)
tree849c5eebf69254c519e8d3f4772a925a4674dd31
parenteeefdf23c3512ce590d9819a174306588af59e20
parenta5fe5ed9ead23735a0a78770c6c628c3fb6ad77c
Merge with vlock-2-timeout