Merge commit 'vlock-2.2-rc3' into vlock-2
commit6bc1454862082af36e99bbece6720526a86b2158
authorFrank Benkstein <frank-vlock@benkstein.net>
Sat, 29 Dec 2007 21:42:26 +0000 (29 22:42 +0100)
committerFrank Benkstein <frank-vlock@benkstein.net>
Sat, 29 Dec 2007 21:42:26 +0000 (29 22:42 +0100)
tree8984303f38ecc1c5e06e7e186746b429af638978
parenta2b15ac522a993ad2f2163f00374a716e6b9f98a
parent6c5c52bb88ab549e0b9e02b4d58266704a966831
Merge commit 'vlock-2.2-rc3' into vlock-2
Makefile