Branch "libreoffice-3-4" has been created. Further changes in master
will be used for LibreOffice-3.5 release.

This is 'libreoffice-3-4' - the stable branch for the 3.4.x releases

    + only bug fixes are allowed
    + no approval needed during beta phase (two weeks after branch)
    + 1 approval needed during rc phase and for bugfix releases
    + 2 approvals with different/no affiliation needed for late features
    + regularly merged into master by a selected person when living

Please watch http://wiki.documentfoundation.org/ReleasePlan
and read announces on libreoffice@lists.freedesktop.org

If you want to build something cool, unstable, and risky, use master.

Conflicts:
	jfreereport/java/flute/makefile.mk
	jfreereport/java/libbase/makefile.mk
	jfreereport/java/libfonts/makefile.mk
	jfreereport/java/libformula/makefile.mk
	jfreereport/java/libloader/makefile.mk
	jfreereport/java/librepository/makefile.mk
	jfreereport/java/libserializer/makefile.mk
	jfreereport/java/libxml/makefile.mk
	jfreereport/java/sac/makefile.mk
	mysqlc/source/mysqlc_connection.cxx
	mysqlc/source/mysqlc_connection.hxx
	mysqlc/source/mysqlc_databasemetadata.cxx
	mysqlc/source/mysqlc_databasemetadata.hxx
	mysqlc/source/mysqlc_driver.cxx
	mysqlc/source/mysqlc_driver.hxx
	mysqlc/source/mysqlc_general.hxx
	mysqlc/source/mysqlc_preparedstatement.hxx
	mysqlc/source/mysqlc_resultsetmetadata.hxx
	mysqlc/source/mysqlc_statement.hxx
	sdext/source/minimizer/impoptimizer.cxx
	sdext/source/pdfimport/config/description.xml
	sdext/source/pdfimport/tree/drawtreevisiting.cxx
	sdext/source/presenter/PresenterWindowManager.cxx
	swext/prj/build.lst