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

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

8398449cbf564aca4341d49f14f5361e57d42cb7