[fbreader/el6: 14/14] Merge branch 'master' into el6

[Michel Alexandre Salim]

commit c66c18e9f35ed76f7774425b9a1c452115e21dd2
Merge: 61247c9 984d7e4
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Mon Aug 1 21:47:59 2011 +0200

    Merge branch 'master' into el6

 fbreader-0.12.10-gcc45.patch |   11 +++++++++++
 fbreader.spec                |   20 ++++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
---