Gentler
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki