Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches e5ebfad1a3 first step to port openafs 13 lat temu
src e5ebfad1a3 first step to port openafs 13 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu