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

Merge remote branch 'origin/master' into experimental

Change-Id: I68e604e4a731f6703fdec7eff2c2c9b9e36879ea
---

fe5765a5f3e1edbd3fc851e8b32e8b6eee35f37a