Merge with vlock-2vlock-2.0-alpha2
commit5b7a854a035a0a10b3b5c43c8eef7e4c56be0944
authorFrank Benkstein <frank-vlock@benkstein.net>
Sat, 28 Jul 2007 14:01:35 +0000 (28 16:01 +0200)
committerFrank Benkstein <frank-vlock@benkstein.net>
Sat, 28 Jul 2007 14:01:35 +0000 (28 16:01 +0200)
treeeaf34c6af93fb84d340e55a747ee4c8219132bfa
parent051eb16fe58e934dff591f659c8254763b9f8186
parent2570767b5c70c71c02163d2c0410b615e921c392
Merge with vlock-2