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

[Clint Byrum]

Clint Byrum has proposed merging lp:~clint-fewbar/ubuntu/natty/cheetah/natty-merge-with-debian into lp:ubuntu/cheetah.

Requested reviews:
  Ubuntu Sponsors Team (ubuntu-sponsors)
  Ubuntu branches (ubuntu-branches)
Related bugs:
  #663343 Please merge cheetah 2.4.2.1-1 (main) from Debian unstable (main)
  https://bugs.launchpad.net/bugs/663343


Merges all changes from Debian sid.
-- 
The attached diff has been truncated due to its size.
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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 524288 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/ubuntu-sponsors/attachments/20101102/4eeae947/attachment-0001.diff