Merged revisions 102807 via svnmerge from