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

Merge remote branch 'origin/master' into experimental

Change-Id: I84dfc81eb14caae02011be2b9fef18a8d7f803f4
---

7cb25d9c562e094c47f37ad34a94d5cafcba2ece