web commit by joey: conflict and merge is done!
[ikiwiki] / GPL
2006-03-15  joeydebianise