Merge branch 'erp5' into master

Conflicts:
	component/rpm2cpio/buildout.cfg

component/libreoffice-bin/buildout.cfg

@@ -13,8 +13,8 @@ find-links =
 recipe = slapos.recipe.build
 # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
 version = 3.5.6
-url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
-
+#url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
+url = http://ftp.psu.ac.th/pub/libreoffice/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
 # supported architectures md5sums
 md5sum_x86 = 079609188b86ede3b3eebe2b75862b31
 md5sum_x86-64 = 6a559fa9c62c810464254d129bd2dc17

component/mariadb/buildout.cfg

@@ -25,10 +25,10 @@ download-only = true
 
 [mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.5.25
+version = 5.5.28a
 revision = 1
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = 943f67c267d73a4080ab497e11740daf
+md5sum = a2d20a040ef1e49944a4ffe65ed7fefa
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0

component/tomcat/buildout.cfg

@@ -12,11 +12,11 @@ parts =
 [tomcat6]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = http://apache.multidist.com/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
-md5sum = 171d255cd60894b29a41684ce0ff93a8
+url = http://apache.multidist.com/tomcat/tomcat-6/v6.0.36/bin/apache-tomcat-6.0.36.tar.gz
+md5sum = 3dde098fd0b3a08d3f2867e4a95591ba
 
 [tomcat7]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = http://apache.multidist.com/tomcat/tomcat-7/v7.0.25/bin/apache-tomcat-7.0.25.tar.gz
-md5sum = 2aa59d23555d641b20efad4aed86b693
+url = http://apache.multidist.com/tomcat/tomcat-7/v7.0.34/bin/apache-tomcat-7.0.34.tar.gz
+md5sum = 0f50494425c24450b4f66dfd4d2aecca