mozilla/webpagemaker — pull request #484 by stenington (2012-07-30 15:51:57+00:00)
Title: Removing merge cruft

A merge marker got left behind in the s2r project! This removes it.