Merge proposals dependent on lp://staging/~bac/charms/oneiric/buildbot-slave/fix-apt-sources

lp://staging/~bac/charms/oneiric/buildbot-slave/fix-apt-sources has no merge proposals.