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