Merge proposals dependent on lp://staging/~random-stuff/mupen64plus/mupen64plus-video-glide64mk2-debian

1. mupen64plus-video-glide64mk2-debian
2. Dependent merge proposals