checking in the rediffed patch.
A patch as a template is just insane. This should be in the themes!