web commit by joey: conflict test
[ikiwiki] / GPL
2006-03-15  joeydebianise