Merge proposals dependent on lp://staging/~clint-fewbar/ubuntu/lucid/squid/fix-upgrades-after-reload

1. Lucid (10.04)
2. fix-upgrades-after-reload
3. Dependent merge proposals