Merge proposals dependent on lp:~james-page/ubuntu/natty/asm2/sweepup-fixes

lp:~james-page/ubuntu/natty/asm2/sweepup-fixes has no merge proposals.