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

[Jan Grulich]

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

    Merge branch master into f18

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