From: John Koleszar <jkoleszar@google.com>
Date: Mon, 8 Nov 2010 13:34:46 +0000 (-0500)
Subject: Merge remote branch 'internal/upstream-experimental' into HEAD
X-Git-Tag: v1.3.0~1217^2~380^2~474^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d383a88e72d26ab21349dfb0ae28047ec26cc04;p=libvpx

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

Conflicts:
	configure

Change-Id: I952d3a50ddd243990d37c5f931bd91a4244d6284
---

5d383a88e72d26ab21349dfb0ae28047ec26cc04