* Merge from debian unstable. Remaining changes: Ubuntu_unit_conversion.patch: - the diff-style patch was converted into quilt format - Ubuntu Policy: output using standard SI unit multiples: KB (10^3), MB (10^6), GB (10^9), TB (10^12) and PB (10^15). Includes manpage update to remove comment about IEC units. LP: #240073.