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

[dmach]

commit 83e705a5e46aee55f971e95d2bc026580d7e6400
Merge: e58137a 4300f35
Author: Daniel Mach <dmach at redhat.com>
Date:   Mon Jul 29 09:51:22 2013 +0200

    Merge branch 'master' into el5

 kobo.spec |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---