Merge proposals dependent on lp:~moonmaker/munin/trunk

lp:~moonmaker/munin/trunk has no merge proposals.