From: John Koleszar <jkoleszar@google.com>
Date: Tue, 11 Jun 2013 23:29:08 +0000 (-0700)
Subject: Merge branch 'master' into experimental
X-Git-Tag: v1.3.0~1111^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0ed677a34d4778d96ee4c31d04e153b52f14394;p=libvpx

Merge branch 'master' into experimental

Change-Id: Ie648398b82f7311143709f55c0e30ba452f50eff
---

d0ed677a34d4778d96ee4c31d04e153b52f14394