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

Merge remote branch 'origin/master' into experimental

Change-Id: I993dbef81ca3d1638e16c4134aa8dc177e57875c
---

32817d6fbe5169413ea05e33bf5a509fcf9f4218