Merge from origin/trunk.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-1_1rc1@1354655 13f79535-47bb-0310-9956-ffa450edef68
42 files changed