[ktp-text-ui/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit eda7e6ea3607a444a30a3819c543ea2dec116fc5
Merge: edfb03a 504ba5f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 9 14:57:18 2012 -0500

    Merge branch 'master' into f16

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