[Merge] lp:~clint-fewbar/ubuntu/natty/cheetah/natty-merge-with-debian into lp:ubuntu/cheetah

[Clint Byrum]

Great feedback, thanks Barry.

Right, I'm only carrying the 2.5 compat patch because it came in w/ the debian sync, and I'd rather stay closer to them for subsequent merges for clarity sake. I suspect it will be dropped in wheezy as well, which is likely the time dh_python2 changes will arrive as well. Maybe we should submit a patch for these two things upstream in experimental?

The Replaces and Conflicts are also changes that happened upstream, and I think make perfect sense for us. 
-- 
https://code.launchpad.net/~clint-fewbar/ubuntu/natty/cheetah/natty-merge-with-debian/+merge/39881
Your team Ubuntu Sponsors Team is requested to review the proposed merge of lp:~clint-fewbar/ubuntu/natty/cheetah/natty-merge-with-debian into lp:ubuntu/cheetah.