[Maria-developers] Rev 2734: auto-merge in file:///home/bell/maria/bzr/work-maria-5.2-merge-5.1-merge/