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

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

a53586d9d1dfcdf49b418a453f2d69dd230b9088