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

[dmach]

commit 71de86c9c99c1bbb81b91214f6257be7af5d2096
Merge: 3d533b4 9953143
Author: Daniel Mach <dmach at redhat.com>
Date:   Mon Oct 14 10:11:35 2013 +0200

    Merge branch 'master' into el6

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