On Monday 03 March 2008 17:21:36 Nico Sabbi wrote: > > dvb1.diff is better: giving preference to the most local > files/settings is the most logical behaviour. > Someone commit, please, or wait for tonight committed, thanks