-
Committer:
Bazaar Package Importer
-
Author(s):
Jonathan Thomas
-
Date:
2009-05-25 19:34:26 UTC
-
mfrom:
(1.1.11 upstream)
(2.3.1 experimental)
-
Revision ID:
james.westby@ubuntu.com-20090525193426-hdntv90rvflyew8g
Tags: 4:3.9.93-1ubuntu1
* Merge from Debian experimental, remaining changes:
  - Conflict/replace -kde4 packages