From: John Koleszar <jkoleszar@google.com>
Date: Sat, 25 Jun 2011 04:05:03 +0000 (-0400)
Subject: Merge remote branch 'internal/upstream' into HEAD
X-Git-Tag: v1.3.0~1217^2~380^2~257
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ce5adb15434556f15e6388b535c988515d40e56;p=libvpx

Merge remote branch 'internal/upstream' into HEAD
---

3ce5adb15434556f15e6388b535c988515d40e56