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

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

6901105e99848561b5804f3aa040c5a3eb089d14