[Merge] lp:~timo-jyrinki/kubuntu-packaging/qtpim-opensource-src_new_snapshot__20140515 into lp:~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src

[Scott Kitterman]

Review: Approve

As far as the diff goes, it looks fine, but of course without the upstream code to check there's no way to see if the reverted patches actually match the upstream changes.
-- 
https://code.launchpad.net/~timo-jyrinki/kubuntu-packaging/qtpim-opensource-src_new_snapshot__20140515/+merge/219667
Your team Kubuntu Packagers is subscribed to branch lp:~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src.