From: John Koleszar <jkoleszar@google.com>
Date: Fri, 26 Aug 2011 04:05:06 +0000 (-0400)
Subject: Merge remote branch 'internal/upstream' into HEAD
X-Git-Tag: v1.3.0~1217^2~380^2~209
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a28115464c3e2ae4b02b3f63fa7047db02552f9;p=libvpx

Merge remote branch 'internal/upstream' into HEAD
---

4a28115464c3e2ae4b02b3f63fa7047db02552f9