Merged revisions 111605 via svnmerge from