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

[dmach]

commit 7ced1b4d2b5fa2c6cbc292d1c7505924d6e855ea
Merge: e253de1 3568cbf
Author: Daniel Mach <dmach at redhat.com>
Date:   Thu Jul 25 09:28:13 2013 +0200

    Merge branch 'master' into el5

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