I think this is correct. The patch didn't apply cleanly and I did the best I could. SVN revision: 15361
SVN revision: 15172