[kde-l10n/f16: 20/20] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 6fc19826a77c923114c33ab03844160da82e2267
Merge: 1b9dca4 89c226c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 01:21:31 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kde-l10n.spec
    	sources

 .gitignore       |  159 +++++++++++++++++++-----------------------------------
 kde-l10n.spec    |   83 +++++++++++++++-------------
 sources          |  107 +++++++++++++++++++------------------
 subdirs-kde-l10n |    5 ++-
 4 files changed, 159 insertions(+), 195 deletions(-)
---