Merged revisions 121804 via svnmerge from