intltool r700 - trunk

[dobey svn gnome org]

Author: dobey
Date: 2007-10-22 19:19:39 +0100 (Mon, 22 Oct 2007)
New Revision: 700
ViewCVS link: http://svn.gnome.org/viewcvs/intltool?rev=700&view=rev

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

	* intltool-merge.in.in (gather_po_files):
	Replace the if (/match/) with a for (split) to handle locales
	separated by whitespace on the same line in the LINGUAS file
	Original patch from Mike Massonnet <mike massonnet gmail com>

	Fixes #488724