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

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

f54d561fa855997a08f0da598d4869f0347f295d