[Merge] lp:~ubuntu-branches/ubuntu/oneiric/apt/oneiric-201104302336 into lp:ubuntu/apt

[James Westby]

James Westby has proposed merging lp:~ubuntu-branches/ubuntu/oneiric/apt/oneiric-201104302336 into lp:ubuntu/apt.

Requested reviews:
  Ubuntu branches (ubuntu-branches)

For more details, see:
https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/apt/oneiric-201104302336/+merge/59603

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/oneiric/apt now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/apt/oneiric-201104302336. A merge should be performed if necessary.
-- 
https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/apt/oneiric-201104302336/+merge/59603
Your team Ubuntu branches is requested to review the proposed merge of lp:~ubuntu-branches/ubuntu/oneiric/apt/oneiric-201104302336 into lp:ubuntu/apt.