Merge proposals dependent on lp://staging/~jorge/charms/precise/phpmyadmin/readme-fix

lp://staging/~jorge/charms/precise/phpmyadmin/readme-fix has no merge proposals.