Merging trunk revs up to 6147 into gpu_dev.
authorbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Fri, 26 Oct 2012 19:14:16 +0000 (19:14 +0000)
committerbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Fri, 26 Oct 2012 19:14:16 +0000 (19:14 +0000)
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6149 2bbb7eff-a529-9590-31e7-b0007b416f81


Trivial merge