FYI trunk has an issue probably due to the latest commits: when you edit a page the save/preview/etc buttons are not displayed and a velocity error is shown instead. -Vincent