Merge proposals dependent on lp://staging/~gary/charms/oneiric/buildbot-master/expand-readme

lp://staging/~gary/charms/oneiric/buildbot-master/expand-readme has no merge proposals.