intltool r670 - trunk

[dobey svn gnome org]

Author: dobey
Date: 2007-02-14 04:01:00 +0000 (Wed, 14 Feb 2007)
New Revision: 670
ViewCVS link: http://svn.gnome.org/viewcvs/intltool?rev=670&view=rev

Modified:
   trunk/ChangeLog
   trunk/intltool-merge.in.in
Log:
2007-02-13  Rodney Dawes  <dobey novell com>

	* intltoole-merge.in.in (xml_merge_output, quoted_merge_translations):
	Check that $lang is a directory, rather than just that it exists
	Create the directory if it doesn't exist, and check that it is a
	directory if it gets created by a different thread
	Original patch from Leonardo Boshell

	Fixes #400788