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

[Barry Warsaw]

Review: Approve
+1 for submitting a bug and patch for cheetah in experimental.  Since we don't have 2.5 anymore, the patch is harmless, so I think keeping in sync is a fine reason to include it.

Thanks!

-- 
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.