Merge branch '2.5.x'
[catacomb] / progs / cookie.1
2013-06-22 Mark WoodingRearrange the file tree.