As usual, forgot to 'bzr add' these. Completes the upgrade to Rails 2.2.2.
As a side benefit, fix an (non-user-visible) bug in display_s5(). Also fixed a bug where removing orphaned pages did not expire cached summary pages.