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