[kde-l10n/f13/master: 45/45] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 0e45f3dc5d15133e29083d959691e1ff70710788
Merge: 2251519 9d1b363
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 09:12:28 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kde-l10n.spec
    	sources
    	subdirs-kde-l10n

 .gitignore       |  114 +++++-----
 kde-l10n.spec    |  654 ++++++++++++++++++++++++++----------------------------
 sources          |  114 +++++-----
 subdirs-kde-l10n |    7 +-
 4 files changed, 428 insertions(+), 461 deletions(-)
---