Waldemar Brodkorb f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
patches e5ebfad1a3 first step to port openafs %!s(int64=11) %!d(string=hai) anos
src e5ebfad1a3 first step to port openafs %!s(int64=11) %!d(string=hai) anos
Makefile f14c1fc551 resolve merge conflict %!s(int64=10) %!d(string=hai) anos