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

[Kevin Fenzi]

commit 3243cc3a55a3af598bf9ed81f8b697c8d31d5d91
Merge: a7f6b1f fffa5a4
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Mon Aug 13 21:36:00 2012 -0600

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

 .gitignore   |   11 +++++++
 calibre.spec |   87 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 sources      |    2 +-
 3 files changed, 82 insertions(+), 18 deletions(-)
---