[kde-l10n/f16: 6/6] Merge branch 'master' into f16

[Rex Dieter]

commit f2357d678e3c38db263ea2457a57686d20958c78
Merge: cf6af5c 3adf81a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:34:03 2012 -0500

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

 .gitignore    |  110 +++++++++++++++++++++++-----------------------
 kde-l10n.spec |  137 +++++++++++++++++++++++++++++----------------------------
 sources       |  110 +++++++++++++++++++++++-----------------------
 3 files changed, 180 insertions(+), 177 deletions(-)
---