Merge proposals dependent on lp:~frankban/charms/oneiric/buildbot-slave/initial

lp:~frankban/charms/oneiric/buildbot-slave/initial has no merge proposals.