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

Merge remote branch 'origin/master' into experimental

Change-Id: I956822324c046c254806dd712a2d3be4dcf8564b
---

6907117175b2b1d913fc37877647c4e70d803a85