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

Merge remote branch 'origin/master' into experimental

Change-Id: I3a4ec6e9fa7059cac52cfdcf9dfe6ef123629db4
---

7cb5a750311048245130ce093309d0402bb438c2