[Maria-developers] bzr commit into mariadb 6.0, with Maria 1.5:maria/6.0 branch (knielsen:3040)