Merge with vlock-2
commitf6ee7d95eb517aecffec5a93f668e89a372b7367
authorFrank Benkstein <frank-vlock@benkstein.net>
Tue, 2 Oct 2007 10:32:49 +0000 (2 12:32 +0200)
committerFrank Benkstein <frank-vlock@benkstein.net>
Tue, 2 Oct 2007 10:32:49 +0000 (2 12:32 +0200)
tree158c2c920b2b913e8266494f79c905c148315094
parent492dd3de740eb28ea0acb7d935e3c848b9ee9942
parent09a754140dd08f289b2cf9e56a21540950332153
Merge with vlock-2