Comment 3 for bug 139821

This patch is rolling up way more than changeset 12492 (not to mention these other changes are taken from a different branch since 12492 was on trunk).

Provided 12492 covers everything that is needed on its own, i'll take just that diff from svn.mythtv.org instead.