[root]/site/app/views/errors
Merging 3.2 branch back onto trunk at r10622.
18 lines of code changed in: