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

Merge remote branch 'origin/master' into experimental

Change-Id: Iaf6e9e14d0cfe5cef3895cfb68524d51139a6d23
---

54c36378287805f4a7aefb89982f7d80b223b3dd