[kcharselect/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit dba5bcdb6b09abf5b3564ab2cfc5e0a113b64492
Merge: c38b4a0 6af7563
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 16:57:28 2012 -0500

    Merge branch 'f18' into f17

 .gitignore       |    1 +
 kcharselect.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---