tree 6266679f4cefce9171c9debd228779e94d454334
parent 05420bf2f875eb6aa7bcc9694638fb72f845aae5
author Jeremias Maerki <jeremias@apache.org> 1235300863 +0000
committer Jeremias Maerki <jeremias@apache.org> 1235300863 +0000

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