* Merge from debian unstable (LP: #889308). Remaining changes: - Apply patch from rdratlos to resolve being unable to join a Windows 7 or Windows 2008 machine to a Samba domain due to the use of cached nss credentials. (LP: #814898) - 0020_original_doc_html_index.patch: Add index html file.