Merge in locking fixes into the main line.
[mmh] / man / folders.man
1 .so man1/folder.1