Merge branch 'master' into rpc

James Moger

2011-10-10 51e21e040c65781cea10b54365e87fa8e0459737

 build.xml

@@ -210,6 +210,7 @@
               <include name="book_16x16.png" />

               <include name="blank.png" />

               <include name="federated_16x16.png" />

               <include name="arrow_page.png" />

            </fileset>



            <!-- Copy Doc images -->

@@ -489,6 +490,7 @@
            <include name="book_16x16.png" />

            <include name="blank.png" />

            <include name="federated_16x16.png" />

            <include name="arrow_page.png" />

         </fileset>



         <!-- Copy Doc images -->

@@ -699,4 +701,4 @@
      <delete dir="${project.war.dir}" />

      <delete dir="${project.deploy.dir}" />

   </target>

</project>
</project>