Code review comment for lp:~lqb/update-notifier/kdeproxy+kwallet-support

Not sure what happened, in case there were need commits in the vcs since you did the change you might want to "bzr merge lp:update-notifier" in your branch, then resolve the conflicts and use "bzr resolve <files_that_conflicted>"