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

Merge remote branch 'origin/master' into experimental

Change-Id: I6d6692418eecf54e23e00a08394b0b37d6e7682b
---

2fa7fe66c41b85b71d74d14a64bf731673f8bc10