Change 214025 on 2012/06/21 17:31:58 by rjk@rjk-rackheath

       re #21178
       Update XYZ branch from trunk, harder.

Change 214010 on 2012/06/21 17:06:32 by rjk@rjk-rackheath

       re #21178
       Update XYZ branch from trunk.