[kdelibs/f17: 2/2] Merge branch 'f18' into f17

[Jan Grulich]

commit 296c2fa21a6d61beea6ed16df7cac40e8cb70fba
Merge: 148a373 4294e82
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Fri Nov 23 16:15:34 2012 +0100

    Merge branch 'f18' into f17

 kdelibs-4.9.3-delete-downloadDialog.patch |    2 +-
 kdelibs.spec                              |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---