Merged revisions 718309,718502 via svnmerge from

Merged revisions 718309,718502 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r718309 | adelmelle | 2008-11-17 18:18:20 +0000 (Mon, 17 Nov 2008) | 4 lines

  Bugzilla 46211:
  Fixed some multi-threading issues in FontCache.java (+ some minor cleanup: simplification of conditionals)
  Thanks to rogov.AT.devexperts.com for tracing and reporting the problem.
........
  r718502 | adelmelle | 2008-11-18 06:43:08 +0000 (Tue, 18 Nov 2008) | 1 line

  Removed erroneous end-element...
........

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@718538 13f79535-47bb-0310-9956-ffa450edef68