Merge proposals dependent on lp://qastaging/~jerico-dev/rhythmbox/rb-ipod-support-video-podcast

1. rb-ipod-support-video-podcast
2. Dependent merge proposals