[kde-l10n/f17: 11/11] Merge branch 'master' into f17

[Rex Dieter]

commit cd10143bf439db08348d9df0e0dfc250fcef9618
Merge: 966918d 420649b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 09:49:56 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kde-l10n.spec
    	sources

 .gitignore       |  165 +++++++++++++++++++++++-----------
 kde-l10n.spec    |  262 ++++++++++++++++++++----------------------------------
 sources          |  110 +++++++++++-----------
 subdirs-kde-l10n |    2 +-
 4 files changed, 263 insertions(+), 276 deletions(-)
---