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

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

5944829d6d26d0d3c090badf5149d8a7a61659e7