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

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

c23096e4a5eed85ba110eee8ac28bab86e05c863