[kde-printer-applet/f17: 2/2] Merge branch 'f18' into f17

[Than Ngo]

commit 30f59d46cd80285ff9a52353b5ba9d61eb4af489
Merge: 9b506db 9e1a193
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:47:08 2012 +0100

    Merge branch 'f18' into f17

 .gitignore              |    1 +
 kde-printer-applet.spec |    6 ++++--
 sources                 |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---