html_safe fix for headliner test.
Merge remote-tracking branch 'origin/rails3' into rails3