Merging branches/fop-1_0 back into trunk

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

diff --cc build.xml
index bddc61d4dc2bcf897fdd18659f1206f66ae8ce1e,fee14ef8ce5dbadc2dfc12e2fad635fffeb03fe2..4bcfd213dff63eaeb0b304ef00b920ccacfc2467
--- 1/build.xml
--- 2/build.xml
+++ b/build.xml
@@@ -133,8 -144,8 +144,8 @@@ list of possible build targets
    <property name="Name" value="Apache FOP"/>
    <property name="name" value="fop"/>
    <property name="NAME" value="FOP"/>
 -  <property name="version" value="1.0"/>
 +  <property name="version" value="svn-trunk"/>
-   <property name="year" value="1999-2009"/>
+   <property name="year" value="1999-2010"/>
    <property name="javac.debug" value="on"/>
    <property name="javac.optimize" value="off"/>
    <property name="javac.deprecation" value="on"/>

diff --cc status.xml
index 353b8059b2e443d2e49b5cf58eb040455cc88eda,faf620aad2ea0e2e8f00e1a0f2ec063795db2dfd..4bb58aebc25e7442b0adeff85378fe862a144280
--- 1/status.xml
--- 2/status.xml
+++ b/status.xml
@@@ -57,7 -57,7 +57,9 @@@
        users, i.e. when the behaviour changes and could affect the layout of existing
        documents. Example: the fix of marks layering will be such a case when it's done.
      -->
 +    <release version="FOP Trunk" date="TBD">
++      </release>
+     <release version="1.0" date="July 2010">
        <action context="Renderers" dev="JM" type="fix">
          AFP Output: Fixed positioning of Java2D-based images (when GOCA is enabled).
        </action>