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

Merge remote branch 'origin/master' into experimental

Change-Id: I81ac427cbaf3d0865df4acef3e0bfc2e95556c4b
---

2c308f36fc0f341eb0be7c5f1cdded13e7d68c2e