[ktp-auth-handler/f17: 5/5] Merge branch master into f18

[Jan Grulich]

commit 2a237e12082ca3c2f769d7b0be0e88c16354ddc7
Merge: 99faf7f caa58fe
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Tue Dec 18 11:00:59 2012 +0100

    Merge branch master into f18

 ktp-auth-handler.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---