As posted to the list

Conflicts:
	share/dictionary.bluecoat