Merge of xfs-cmds-2.4.18:slinx:112264a by nathans.