Merge from Trunk revisions 741104 - 744926.

author Jeremias Maerki <jeremias@apache.org>

Mon, 16 Feb 2009 15:48:44 +0000 (15:48 +0000)

committer Jeremias Maerki <jeremias@apache.org>

Mon, 16 Feb 2009 15:48:44 +0000 (15:48 +0000)
author Jeremias Maerki <jeremias@apache.org>
Mon, 16 Feb 2009 15:48:44 +0000 (15:48 +0000)
committer Jeremias Maerki <jeremias@apache.org>
Mon, 16 Feb 2009 15:48:44 +0000 (15:48 +0000)
diff --cc build.xml
Simple merge
diff --cc src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
Simple merge
diff --cc src/java/org/apache/fop/render/ps/ResourceHandler.java
Simple merge
author	Jeremias Maerki <jeremias@apache.org>
	Mon, 16 Feb 2009 15:48:44 +0000 (15:48 +0000)
committer	Jeremias Maerki <jeremias@apache.org>
	Mon, 16 Feb 2009 15:48:44 +0000 (15:48 +0000)
		1	2
build.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/java/org/apache/fop/fonts/type1/Type1FontLoader.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/java/org/apache/fop/render/ps/ResourceHandler.java	patch \|	diff1 \|	diff2 \|	blob \| history