more updates for trail merge
[ikiwiki] / debian / compat
1 7