Merge branch 'upstream' into dfsg-upstream

Conflicts:
	directory/sdks/c-sdk/ldap/examples/macintosh/asearch (2i).68k.u
	directory/sdks/c-sdk/ldap/examples/macintosh/asearch (4i).68k.u
	directory/sdks/c-sdk/ldap/examples/macintosh/asearch PPC.u
	directory/sdks/c-sdk/ldap/libraries/macintosh/LDAPClient.mcp
	mozilla/other-licenses/branding/firefox/branding.nsi
	other-licenses/branding/sunbird/locales/Makefile.in