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

Merge remote branch 'origin/master' into experimental

Change-Id: I67cc3b490266f958a1b3a935ec08ee19d7b4f6a0
---

6c8205d37eb47c0757f752505ada46bc4079c003