Merge with vlock-2-release
commita16baad9015ab0f098b89c4083c5b91c5d83060d
authorFrank Benkstein <frank-vlock@benkstein.net>
Wed, 3 Oct 2007 00:59:13 +0000 (3 02:59 +0200)
committerFrank Benkstein <frank-vlock@benkstein.net>
Wed, 3 Oct 2007 00:59:13 +0000 (3 02:59 +0200)
treef1bb40a01eba6a1a3cca9256a35dc538ecf5c128
parent04d8b06d598978294936ff68c6a808ee12c46f05
parentef09ede459887d054e3be6d3e6589624747c0544
Merge with vlock-2-release