tree fb7807cdd54a7bac57af343da9bcd463378add0e
parent aa7e5bd934ea05bc85dbd14166b76a5b2ba84081
author Glenn Adams <gadams@apache.org> 1340821240 +0000
committer Glenn Adams <gadams@apache.org> 1340821240 +0000

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