-
Committer:
Bazaar Package Importer
-
Author(s):
Matthias Klose
-
Date:
2006-12-06 11:10:04 UTC
-
mfrom:
(1.1.3 upstream)
(3.1.1 etch)
-
Revision ID:
james.westby@ubuntu.com-20061206111004-y64dy22k2i5ruacf
Tags: 2.6.2-1ubuntu1
* Merge with Debian unstable; remaining changes:
- Conflict with old xrdb.
- debian/rules: Extend clean target.