[Maria-developers] [Merge] lp:~qu1j0t3/maria/solaris10-port into lp:maria