Just in case libusb's busnum and devnum are not unique on OS X
When applying column header state explicitly change section hidden for every column not just the ondevice column
Replace deprecated __defineGetter__ and __defineSetter___

__defineGetter__ was not working in Qt 5, this caused the following
regressions:

PDF Output: Header and footer templates not working in calibre 2.0.
Fixes #1361483 [Headers and footers don't appear EPUB to PDF](https://bugs.launchpad.net/calibre/+bug/1361483)

E-book viewer: The Table of Contents not displaying the currently viewed
section in bold if the section is a link to a location in the middle of
a file.
Change the "emblem" preference stuff so that the template editor does not show the icon type fields.
Merge branch 'master' of https://github.com/cbhaley/calibre
Add some missing plugins to the Qt bundled with calibre on linux
Change help text for double click on library view tweak
Remove platform theme plugin as it causes crashes in Ubuntu
Book list: Fix Ctrl+Home/End not selecting the first/last book
Fix odd selection mode for customize toolbars dialog
Workaround the broken hackery that the DOC Input plugin does, that causes it to break the Input Options Preferences in calibre 2.0
OS X: Workaround for Qt 5 bug that causes the popup menu on the author to author sort button in the edit metadata dialog to not respond if the mouse button if not released once before clicking menu entries. See #1362338 (Copy Author Sort to Author isn't working)

https://bugreports.qt-project.org/browse/QTBUG-41017
Add support for new Kobo Aura H2O and firmware 3.8.0

Kobo have announced a new device. It uses the same firmware as their
other devices. This adds the device id and name.

There is also a new firmware version released. This is version 3.8.0,
but I am allowing 3.8.1. There are no changes needed to support the
firmware.

Fixes #1362435 [Add support for new Kobo Aura H2O and firmware 3.8.0](https://bugs.launchpad.net/calibre/+bug/1362435)
Patch to Qt WebKit to fix rendering of soft hyphens in the viewer
version 2.1
...
...
Fix cracked.com
Check Book: Fix an error caused by empty style tags when auto-renaming mismatched font names. Fixes #1363028 [renaming incorrectly named fonts fails](https://bugs.launchpad.net/calibre/+bug/1363028)
Fix a regression in calibre 2.0 that caused setting the value of a custom number column to zero via the book list to clear the field instead. Fixes #1363076 [The number zero doesn't appear](https://bugs.launchpad.net/calibre/+bug/1363076)