Record merge back to live again.

To avoid superfluous future conflicts.

svn path=/website/public_html/live/; revision=84385