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

Merge remote branch 'origin/master' into experimental

Change-Id: Ica63d16cb39e2d65a3414f0b9f86c8a64112dfa3
---

6058c9ce0cd8305b13a4766370c67059f789b816