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

[Than Ngo]

commit a498646018e29ec49b83a4d4361ca5d920492433
Merge: b598286 ca34a44
Author: Than Ngo <than at redhat.com>
Date:   Thu Jul 12 14:41:29 2012 +0200

    Merge branch 'f17' into f16

 kdelibs-4.8.4-kjs-locale.patch |   18 ++++++++++++++++++
 kdelibs.spec                   |    9 ++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---