[calibre/f14/master: 2/2] Merge branch 'master' into f14 Upgrade to 0.7.20

[Kevin Fenzi]

commit 3c7eb9e64a8d621cdb3bd956be0a8f7f8b2ecbf3
Merge: 746c23b 9d08f54
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Fri Sep 24 17:12:25 2010 -0600

    Merge branch 'master' into f14
    Upgrade to 0.7.20

 .gitignore   |    1 +
 calibre.spec |    7 +++++--
 sources      |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc calibre.spec
index cfbe04a,e527637..971b9b9
--- a/calibre.spec
+++ b/calibre.spec
@@@ -250,9 -250,9 +250,12 @@@ f
  %{_mandir}/man1/*
  
  %changelog
+ * Fri Sep 24 2010 Kevin Fenzi <kevin at tummy.com> - 0.7.20-1
+ - Update to 0.7.20
+ 
 +* Fri Sep 17 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.18-3.1
 +- rebuild (ImageMagick)
 +
  * Wed Sep 15 2010 Kevin Fenzi <kevin at tummy.com> - 0.7.18-3
  - Rebuild for new ImageMagick