Merged revisions 101219 via svnmerge from