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