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

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

23d525a5035a3e00cd2c2a65147e9c878c738014