[mythtv] conflicts and mythweb

[Chris Petersen]

I just updated to today's CVS, and suddenly all shows are showing with
the "will record" class.  Not sure who checked in the changes that
affected this, but could you please look at this code?  I'll also try to
find some time tonight to examine/apply submitted patches.

Also, when someone other than me checks patches into mythweb, could you
please let me know, or reply to the poster's message saying it's done? 
I apparently miss stuff on the commits list, and I since I do keep
submitted patches around, it's annoying to run into patches that have
already been applied (especially if through other patches it appears
they're only partially applied).

-- 
Chris Petersen
Programmer / Web Designer 
Silicon Mechanics:  http://www.siliconmechanics.com/
Blade Servers:      http://www.siliconmechanics.com/c292/blade-server.php
1U Servers:         http://www.siliconmechanics.com/c272/1u-server.php