* Add Ubuntu One pairing to desktopcouch, the code looks for credentials at start time and will listen to them while the dbus service is running. * On couchdb failure, reconnect with logic that starts up the couchdb server again and uses the new port. Instead of giving python-couchdb view objects to the user, give an object we own that implements reconnecting to the server on errors, and proxies commands otherwise. (LP: #522538) * Support new Basic auth for HTTP that our bookmark file requires. Make Basic-auth part of compulsory INI file. (LP: #599745) * When a stored record exists and is marked as deleted, and a user tries to store a new record with the same ID, do some ugly work to make the user's record be the deleted-record's successor. (LP: #462245) * Removed debian/patches/lp_599745.patch since it was included in upstream. * Fix errors in parameters in new code. (LP: #634396 #634784)