[kcharselect/f18: 8/8] Merge branch 'master' into f18

[Than Ngo]

commit 867b451635bb81f322ee40932f97e689e2ead029
Merge: 44f4be0 377d363
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 17:01:11 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kcharselect.spec
    	sources

 .gitignore       |    1 +
 kcharselect.spec |   22 ++++++++++++++++++----
 sources          |    2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 2084f18,42169d7..8f3965e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/kcharselect-4.8.5.tar.xz
 +/kcharselect-4.9.1.tar.xz
 +/kcharselect-4.9.2.tar.xz
 +/kcharselect-4.9.3.tar.xz
 +/kcharselect-4.9.4.tar.xz
 +/kcharselect-4.9.5.tar.xz
+ /kcharselect-4.10.1.tar.xz