[calibre/f17] (5 commits) ...Merge remote-tracking branch 'origin/master' into f17

[Kevin Fenzi]

Summary of changes:

  f140818... Update to 0.8.40 (*)
  2e280e0... Update to 0.8.41 (*)
  6b8fd02... Rebuild for new ImageMagick (*)
  cce1ce1... Update to 0.8.42 (*)
  f97504a... Merge remote-tracking branch 'origin/master' into f17

(*) This commit already existed in another branch; no separate mail sent