Temporary branch to aid in merge from 1.1 branch.

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