Merge proposals dependent on lp://staging/~james-page/charms/oneiric/jenkins/trunk

lp://staging/~james-page/charms/oneiric/jenkins/trunk has no merge proposals.