[kobo/el5: 2/2] Merge branch 'master' into el5

[dmach]

commit 1dc893af6b528648098c3c6f5ddd5f9887c1ea77
Merge: 83e705a 9953143
Author: Daniel Mach <dmach at redhat.com>
Date:   Mon Oct 14 10:12:32 2013 +0200

    Merge branch 'master' into el5

 .gitignore |    1 +
 kobo.spec  |   11 +++++++++--
 sources    |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---