From: John Koleszar <jkoleszar@google.com>
Date: Mon, 4 Jun 2012 22:11:42 +0000 (-0700)
Subject: Merge branch 'origin/eider' into master
X-Git-Tag: v1.2.0~177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=598759be1daeef71bb5644bbf617b798630f5db3;p=libvpx

Merge branch 'origin/eider' into master

Change-Id: I79fd7bd18aa1af41cd066ccc3d1cd16744b9c8d1
---

598759be1daeef71bb5644bbf617b798630f5db3