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

Merge remote branch 'origin/master' into experimental

Change-Id: I7125984ec28a7094195b640d6659590c6eead533
---

ae4db164e5ece4ffdf8d2f460940244763e5052d