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

[dmach]

commit d4f19f99c2d4c4e35aef7f98c521412f26a31561
Merge: 71de86c b38060d
Author: Daniel Mach <dmach at redhat.com>
Date:   Tue Dec 17 14:32:17 2013 +0100

    Merge branch 'master' into el6

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