From: John Koleszar <jkoleszar@google.com>
Date: Fri, 11 Mar 2011 05:05:09 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into experimental
X-Git-Tag: v1.3.0~1217^2~485
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=314631ca6142a38507ee683ed03be1a504a03753;p=libvpx

Merge remote branch 'origin/master' into experimental

Change-Id: Ibc4a75dbbc8b35ce298477e055e5a88df080d4b3
---

314631ca6142a38507ee683ed03be1a504a03753