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

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

84f5b14b0ed878739533dabe63498311582da4b1