Port logic changes from latest upstream recipe (r11701).
Port logic changes from latest upstream recipe (r11701).

Bring in logic changes from
http://bazaar.launchpad.net/~kovid/calibre/trunk/view/head:/recipes/inst
apaper.recipe revision 11701

edwinsteele/python-scripts,edwinsteele/python-scripts