From: John Koleszar <jkoleszar@google.com>
Date: Fri, 22 Jul 2011 04:05:10 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into experimental
X-Git-Tag: v1.3.0~1217^2~413
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc9e1b7683a5e7cb0c21d12e27552ed4aa5eb152;p=libvpx

Merge remote branch 'origin/master' into experimental

Change-Id: I8b0a76b3232c8cff15c0ca5289e18af6889e5095
---

dc9e1b7683a5e7cb0c21d12e27552ed4aa5eb152