Merged revisions 100930 via svnmerge from