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

Merge remote branch 'origin/master' into experimental

Change-Id: Icee86a4b25e53dc04b508179101b1a782b688f61
---

6e4f6c96b31ce43850beb5384117f6171bf643ad