Merge branch 'master' into obi/master
[vuplus_dvbapp] / userbouquet.srgssr.tv
2005-10-29 Andreas Monzneradd some default bouquets