Merge with vlock-2
commit72b2e4a6598cf0d36001603c1e4a8c90b9334437
authorFrank Benkstein <frank-vlock@benkstein.net>
Sat, 29 Sep 2007 13:06:15 +0000 (29 15:06 +0200)
committerFrank Benkstein <frank-vlock@benkstein.net>
Sat, 29 Sep 2007 13:06:15 +0000 (29 15:06 +0200)
tree61c4918dc030e4baf97afdb3c4e19c1a90532f74
parent21ea80e0edb12f42a0ca7f2f076adb802aaf38ad
parentbdb8289eb23a28da3fc3c8e53e9282f9c8b38021
Merge with vlock-2