-
Committer:
Bazaar Package Importer
-
Author(s):
Jonathan Riddell
-
Date:
2008-05-28 10:11:41 UTC
-
mfrom:
(1.2.14 upstream)
-
Revision ID:
james.westby@ubuntu.com-20080528101141-4of87se42gahtpvs
Tags: 4:4.0.80-1ubuntu1
* Merge with Debian
* Add conflicts on -kde4 packages