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

Merge remote branch 'origin/master' into experimental

Change-Id: I0aaefeafeb6b2b07ec792024edf4751f2860aa23
---

f7084f35dacde659e260284a5846b54bfe359d9d