Merge with vlock-2
commit5db07543561e0160405575b2feb71dfc6e1cf46f
authorFrank Benkstein <frank-vlock@benkstein.net>
Tue, 2 Oct 2007 20:29:41 +0000 (2 22:29 +0200)
committerFrank Benkstein <frank-vlock@benkstein.net>
Tue, 2 Oct 2007 20:29:41 +0000 (2 22:29 +0200)
tree9e3a794438ef3cff0e1c6c67a7c25afb4a3ffc49
parent555a23ea5eef36730d5e14aa4caaa0461739fcb8
parent77705a3458200f4df903df0bace2fa03c2dfca2f
Merge with vlock-2