merge selected changes from 'branches/diogenes-newplugins':
[diogenes.git] / debian / compat
1 4