Merge proposals dependent on lp:~yellow/charms/oneiric/buildbot-master/trunk

lp:~yellow/charms/oneiric/buildbot-master/trunk has no merge proposals.