[Merge] ~khurshid-alam/ubuntu/+source/rhythmbox:master into ~ubuntu-desktop/ubuntu/+source/rhythmbox:ubuntu/master

[Khurshid Alam]

I simply added the patch with gbp pq and modify debian/control. I left updating changelog, because I never do that for other upstream merge.
-- 
https://code.launchpad.net/~khurshid-alam/ubuntu/+source/rhythmbox/+git/rhythmbox/+merge/362491
Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/rhythmbox:ubuntu/master.