Trying to work around a problem reintegrating the branch. Found a blog entry that lists deleting mergeinfo entries in subdirectories as a possible solution. Hopefully, this will help.

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