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

Merge remote branch 'origin/master' into experimental

Change-Id: Ie6bc53eb61dc772f308abce9bf93bcc67b38f670
---

3d1f3fc6c9f20c9c42b51d3838a2ab10f2c362b5