Merge with vlock-2-release
commit7058cd1e744443769b306153d959e65f9180e402
authorFrank Benkstein <frank-vlock@benkstein.net>
Fri, 21 Sep 2007 23:43:12 +0000 (22 01:43 +0200)
committerFrank Benkstein <frank-vlock@benkstein.net>
Fri, 21 Sep 2007 23:43:12 +0000 (22 01:43 +0200)
tree0667567f328e5ff7654349afcefd2aa047d0acce
parente6ba394176a6ea7e34330fa9511a353cf8283458
parent6d50e5d3dbca0a64bfddd35af51b438eba5ca756
Merge with vlock-2-release