landing patch from http://codereview.appspot.com/5874051/

git-svn-id: http://skia.googlecode.com/svn/trunk@3468 2bbb7eff-a529-9590-31e7-b0007b416f81
1 file changed