Merge with vlock-2
commit6560f381844c54f08c692fd9138021c84188c1d4
authorFrank Benkstein <frank-vlock@benkstein.net>
Tue, 2 Oct 2007 20:14:32 +0000 (2 22:14 +0200)
committerFrank Benkstein <frank-vlock@benkstein.net>
Tue, 2 Oct 2007 20:14:32 +0000 (2 22:14 +0200)
tree3e7febff5d48baf487b2ebf00573b0552b2c0d94
parentad6d21dc52951f86cb037c26cc87ffeca62c7a8b
parent9bd24bd67168a835c6d96102bfae2613e11c4cbe
Merge with vlock-2