Merge of master-melb:xfs-cmds:22995a by kenmcd. Do some more checks.
Merge of xfs-cmds-melb:slinx:19868a by kenmcd. Simplify instructions to use make_irix script.