From: John Koleszar <jkoleszar@google.com>
Date: Wed, 13 Jul 2011 04:05:04 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into experimental
X-Git-Tag: v1.3.0~1217^2~420
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffc4587a47bf9a12e867310da8060662d08c0da2;p=libvpx

Merge remote branch 'origin/master' into experimental

Change-Id: I9dab62c24d71f71cdc36732ed8ed469bee67d7e1
---

ffc4587a47bf9a12e867310da8060662d08c0da2