From: John Koleszar <jkoleszar@google.com>
Date: Wed, 16 Feb 2011 05:05:13 +0000 (-0500)
Subject: Merge remote branch 'internal/upstream' into HEAD
X-Git-Tag: v1.3.0~1217^2~380^2~377
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e786bd3a01e60eee98b0fb3cf09fc58f66742eab;p=libvpx

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

e786bd3a01e60eee98b0fb3cf09fc58f66742eab