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

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

d1910cc4843ad4cc81964de3779222087c50c220