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

Merge remote branch 'origin/master' into experimental

Change-Id: I9cead934ebea85d81aceaaec4674efc74367f984
---

2c3c54f7475021e2fbc62998b042e54efa9f142c