Ensure nonfree/tainted media is kept enabled on distro upgrade. Patch from Maarten Vanraes and Dave Hodgins and tweaked by me for trunk.