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