[calibre/f17: 3/3] Merge remote-tracking branch 'origin/master' into f17

[Kevin Fenzi]

commit 5dcfc49413e7f6b392511bb628de2d90da3825fe
Merge: 2497bcc 35a0a2c
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sun Nov 18 13:33:50 2012 -0700

    Merge remote-tracking branch 'origin/master' into f17

 .gitignore                               |    1 +
 calibre-0.8.64-unbundle-feedparser.patch |   36 ------------------------------
 calibre.spec                             |   19 +++++++++++----
 sources                                  |    2 +-
 4 files changed, 16 insertions(+), 42 deletions(-)
---