Merge commit 'origin/master' into aggregateinternal
[ikiwiki] / debian / compat
2006-03-15  joeydebianise