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

Merge remote branch 'origin/master' into experimental

Change-Id: Ie2a4927754a9c220b30a84fc7e1372e565fe9eec
---

d63ce5db34815029159b2ed87e3c6ce65c276662