Merge commit 'repo/vlock-2-release' into vlock-2
commitd64adff470e78f7355bc0aa145f630ed76933c1d
authorFrank Benkstein <frank-vlock@benkstein.net>
Tue, 22 Jan 2008 18:47:44 +0000 (22 19:47 +0100)
committerFrank Benkstein <frank-vlock@benkstein.net>
Tue, 22 Jan 2008 18:47:44 +0000 (22 19:47 +0100)
tree844969eea230ad430b256005d3edc58d4331744d
parent41e84fdd5c6eff663fd92d95097f9468a5544b77
parent7f0bd2ed913e0059e5a437f8b48a670f6bf8bd8f
Merge commit 'repo/vlock-2-release' into vlock-2