intltool r705 - trunk

[dobey svn gnome org]

Author: dobey
Date: 2007-11-25 18:35:40 +0000 (Sun, 25 Nov 2007)
New Revision: 705
ViewCVS link: http://svn.gnome.org/viewcvs/intltool?rev=705&view=rev

Modified:
   trunk/ChangeLog
   trunk/intltool-merge.in.in
Log:
2007-11-25  Rodney Dawes  <dobey pwns gmail com>

	* intltool-merge.in.in (xml_merge_output):
	Output the untranslated file in C/ for multiple output
	Only output in the current directory for single-file output

	Fixes #487817