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

[Kevin Fenzi]

commit f97504aa046656e545dda75daab4483c47e709ca
Merge: 5aa0c28 cce1ce1
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Mon Mar 12 09:47:19 2012 -0600

    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	calibre.spec

 .gitignore   |    3 +++
 calibre.spec |   19 ++++++++++++++-----
 sources      |    2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)
---