Merge with vlock-2
commit555571999264e987f249c64167d97fc4e199ac96
authorFrank Benkstein <frank-vlock@benkstein.net>
Sat, 29 Sep 2007 13:07:24 +0000 (29 15:07 +0200)
committerFrank Benkstein <frank-vlock@benkstein.net>
Sat, 29 Sep 2007 13:07:24 +0000 (29 15:07 +0200)
tree87901666e24d2b9eeb988fe94314b28243b9a3d6
parent72b2e4a6598cf0d36001603c1e4a8c90b9334437
parent3701c4b20fc6facef09ceb9f327be1cd21b7308e
Merge with vlock-2