Oops, didn't remove the conflict markers :) Doing that now. -- https://code.launchpad.net/~bilalakhtar/ubuntu/maverick/skim/merge-609679/+merge/31506 Your team Ubuntu Sponsors Team is requested to review the proposed merge of lp:~bilalakhtar/ubuntu/maverick/skim/merge-609679 into lp:ubuntu/skim.