Merge remote-tracking branch 'origin/master' into erp5-component
version up : MariaDB 10.0.5.
specify the location of pcre.h that is used in some header files in MariaDB 10.0.5.
version up : LibreOffice 3.6.7.2.
version up : MariaDB 10.0.6.
Merge branch 'erp5-component' into erp5