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

[Kevin Fenzi]

commit a7f6b1fc229689036b2bc36b938c0f8dd0dadcfb
Merge: f97504a c6f1539
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri May 4 16:07:22 2012 -0600

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

 .gitignore   |    7 +++++++
 calibre.spec |   35 +++++++++++++++++++++++++++++++----
 sources      |    2 +-
 3 files changed, 39 insertions(+), 5 deletions(-)
---