2004-11-06  Rodney Dawes  <dobey@novell.com>

	* NEWS:
	* configure.in: Up version to 0.32.1 for release

2004-11-06  Danilo Šegan  <dsegan@gmx.net>
 
	Fixes #145017.
	
	* NEWS: Document changes.

	* tests/selftest.pl.in (check_multimerge_result): Removed "-p" and
	"-u" options.

	* tests/results/merge1.xml: Updated test result.
	
	* intltool-merge.in.in (print_help): modify -p, -u help messages.
	(utf8_sanity_check): default to UTF-8.
	(entity_encode): only minimalistic encoding.
	(entity_encode_int_even_high_bit): removed.
	Added utf8_sanity_check for all styles except RFC822.
	(traverse): s/"<$nodename$outattr"/"<$nodename", $outattr/.

2004-11-05  Rodney Dawes  <dobey@novell.com>

	* NEWS: Update for bug fix

	* intltool-update.in.in ($ini_support): Add support for .icon files
	Original patch from Takao Fujiwara <Takao.Fujiwara@Sun.COM>

	ChangeLog: Fix date for previous entry (doh)

	Fixes #157412

2004-11-05  Danilo Šegan  <dsegan@gmx.net>

	* intltool-merge.in.in (getAttributeString): I missed some parts
	of the patch during commit of #155843 fix (2004-10-23).

2004-11-04  Rodney Dawes  <dobey@novell.com>