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

[dmach]

commit a6d95bc2763de5dd52d05622a5e977cdcb8c903b
Merge: 81c947d 3568cbf
Author: Daniel Mach <dmach at redhat.com>
Date:   Thu Jul 25 09:27:19 2013 +0200

    Merge branch 'master' into el6

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