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

[Kevin Fenzi]

commit a53be5a34ed1cbb42ae3f6c69435ce59eaf1b25c
Merge: 3243cc3 255918e
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sat Oct 6 11:17:53 2012 -0600

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

 .gitignore                               |    9 +
 calibre-0.8.64-unbundle-feedparser.patch | 3959 ++++++++++++++++++++++++++++++
 calibre.spec                             |   57 +-
 sources                                  |    2 +-
 4 files changed, 4020 insertions(+), 7 deletions(-)
---