Merge branch '2.4.x'
[catacomb] / symm / t / seal
2013-06-22 Mark WoodingRearrange the file tree.