Branches for Vivid

Author: James Page
Revision Date: 2014-06-30 12:10:24 UTC

* Merge from Debian unstable (LP: #1251563). Remaining changes:
  - Ubuntu_unit_conversion.patch:
    + 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.
  - Update Bug#254243-netstat.c-wide-opt.patch:
    + Increase size of remote and local address buffers 64->128.
  - Make the package Multi-Arch: foreign.
* Dropped overlapping changes in Bug#254243-netstat.c-wide-opt.patch with:
  - Bug#508110-inet6.c-initialize_fields.patch
  - Bug#632660-netstat.c-long_udp6_addr.patch