Merge commit 'jelmer/master'
[ikiwiki] / ikiwiki-update-wikilist
2007-09-06  joey commit.