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

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

766fce16c42ac11c9cf08731ac5d73376d420743