-
Committer:
Bazaar Package Importer
-
Author(s):
Muharem Hrnjadovic
-
Date:
2009-05-04 12:29:43 UTC
-
mfrom:
(3.1.3 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090504122943-6zyafjosb8a1u21q
Tags: 1.60-23ubuntu1
* 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.
Dropped patches, already in debian:
- lib/ec_hw.c: #include <stddef.h to get definition of NULL.
- lib/fddi.c: #include <linux/types.h> to get types. LP: #66209.