File diff r6979:c72bc9ef55cf → r6980:3b43790d6e21