[Maria-developers] bzr push into mariadb 6.0, with Maria 1.5:maria/6.0 branch (sanja:3037 to 3038)