From: John Koleszar <jkoleszar@google.com>
Date: Thu, 20 Jan 2011 05:05:23 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into experimental
X-Git-Tag: v1.3.0~1217^2~513
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ac80a74f80452a5212c0680e678be6ab7541bed;p=libvpx

Merge remote branch 'origin/master' into experimental

Change-Id: Ia0840303fe1dc8c12f3389e7a1fe20b6d3c6b9c5
---

3ac80a74f80452a5212c0680e678be6ab7541bed