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

Merge remote branch 'origin/master' into experimental

Change-Id: I3f64e220b78738e5261a9fda3c270d51613f4faa
---

86edcb0cc78fac2c3c086702fa98934e690bc290