-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2006-07-06 11:44:44 UTC
-
mfrom:
(1.1.3 upstream)
-
Revision ID:
james.westby@ubuntu.com-20060706114444-t2mcia6ou8h3ja8g
Tags: 5.2.2-4ubuntu1
* Merge with Debian unstable, clean up Ubuntu delta.
* Ubuntu changes left:
  - Disable libsensors support.
  - debian/snmpd.init: SNMP_PERSISTENT_FILE=/dev/null (from
    5.1.2-6.1ubuntu1).