[kde-print-manager/f19: 9/9] Merge branch 'master' into f19

[Rex Dieter]

commit c83d2a2f2841e926a7d70b3e7a251704a860c0f1
Merge: 257eb28 ceb3eec
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:22:35 2013 -0500

    Merge branch 'master' into f19

 .gitignore             |    5 ++++
 kde-print-manager.spec |   51 +++++++++++++++++++++++++++++++++--------------
 sources                |    2 +-
 3 files changed, 42 insertions(+), 16 deletions(-)
---