zapit/src/zapit.cpp: simplify
styling for EPG view/eventlist (patch from Benny, thanks!)
Revert "styling for EPG view/eventlist (patch from Benny, thanks!)"

This reverts commit 5809315cc59d3436ad62bbeacb3c0e11446a10d9
because this commit seems to need some more affection.
Merge branch 'next-cc' into next (untested)
Merge branch 'next' of git://gitorious.org/neutrino-mp/max10s-neutrino-mp into next