[fbreader/f14: 4/4] Merge branch 'master' into f14

[Michel Alexandre Salim]

commit 17c6891a942afabc5c8d2685a0b243dcdd5f892d
Merge: b037376 984d7e4
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Mon Aug 1 20:16:42 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	fbreader.spec

 fbreader.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---