movieplayer: memset() with zero length is useless
small fix (thx udog)
zapit/bouquets: count locked bouquets a channels is in, and honor lock in all bouquets
zapit/bouquets: rename bAlwaysLocked => bLockCount
/pictureviewer.cpp CPictureViewer::GetLogoName: don't add the same dir twice
Merge branch 'next-cc' into next (untested)
Merge branch 'next' into next