[Commits] Rev 2836: merged with 5.1 in http://bazaar.launchpad.net/~maria-captains/maria/5.2/