From: John Koleszar <jkoleszar@google.com>
Date: Fri, 11 Feb 2011 05:05:19 +0000 (-0500)
Subject: Merge remote branch 'internal/upstream' into HEAD
X-Git-Tag: v1.3.0~1217^2~380^2~383
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64aebb6c7ad2983d422325babf42594bd3b6a45e;p=libvpx

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

64aebb6c7ad2983d422325babf42594bd3b6a45e