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

Merge remote branch 'origin/master' into experimental

Change-Id: I83fd03ca0970314c81e834857cbd911dffa9a9de
---

c55589124976a9b4dfdbecbebe704d77e08d8cd5