[Merge] lp:~ubuntu-branches/ubuntu/intrepid/albatross/intrepid-201105300148 into lp:ubuntu/intrepid/albatross

[James Westby]

James Westby has proposed merging lp:~ubuntu-branches/ubuntu/intrepid/albatross/intrepid-201105300148 into lp:ubuntu/intrepid/albatross.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)

For more details, see:
https://code.launchpad.net/~ubuntu-branches/ubuntu/intrepid/albatross/intrepid-201105300148/+merge/62833

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