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

Merge remote branch 'origin/master' into experimental

Change-Id: I9761428209518b7fcbde60e884c06754664c0c36
---

ca60e0c2f9f7b70a576c28f20d84d77acc95f958