Add truncatechars_html filter.
truncatechars_html now working
Merge branch 'master' of github.com:martmatwarne/django

Conflicts:
	docs/releases/1.6.txt
Merge branch 'master' of https://github.com/django/django
Fixed 19496

truncatechars_html was incorrectly adding the '...' to text under the
truncate length but only by 3 or fewer characters.
Merge branch 'master' of https://github.com/saturn597/django into 19496