[calibre/f16: 11/11] Merge branch 'master' into f16

[Christian Krause]

commit 613b043457fdf212e69fb695952f54088adb9db3
Merge: 1822747 ac1043e
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sat Dec 31 01:31:09 2011 +0100

    Merge branch 'master' into f16

 .gitignore              |    8 ++++++++
 calibre-no-update.patch |   23 ++++++++++-------------
 calibre.spec            |   36 ++++++++++++++++++++++++++++++++++--
 generate-tarball.sh     |    2 +-
 sources                 |    2 +-
 5 files changed, 54 insertions(+), 17 deletions(-)
---