Remove patches for sys-apps/paludis-1.4.2-r1
Merge branch 'stage' into prime
Remove {virtual,media-video}/ffmpeg keywords
Merge branch 'stage' into prime