merge from mysql-5.5
tweak package dependancies etc