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