[ebook-tools/f12/master: 4/4] Merge branch 'master' into f12

[Rex Dieter]

commit 9e639f30e4a06429ca0b30a22ab257ce3a907437
Merge: 9543b02 7df99a0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 30 13:33:59 2010 -0500

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore

 .gitignore                          |    2 +-
 ebook-tools-0.1.1-rmhardcoded.patch |   11 ---------
 ebook-tools-0.2.0-rmhardcoded.patch |   11 +++++++++
 ebook-tools.spec                    |   40 ++++++++++++++++++++--------------
 sources                             |    2 +-
 5 files changed, 36 insertions(+), 30 deletions(-)
---