[libkkc/f17: 2/2] Merge branch 'master' into f17

[Daiki Ueno]

commit 7ce4c20ec367f642b9f3a7ff2c4b7e0e8513d846
Merge: 1eab9c7 ace0683
Author: Daiki Ueno <dueno at redhat.com>
Date:   Sat Jun 8 08:56:58 2013 -0400

    Merge branch 'master' into f17

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