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

Merge remote branch 'origin/master' into experimental

Change-Id: I7d91efbc3662c86d6efa2d7495eb4689ccdb0ced
---

c26bb0fe8f84d6e9b67f9304fc2b1b980e153a37