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