From: Yaowu Xu <yaowu@google.com>
Date: Thu, 21 Jul 2011 16:05:24 +0000 (+0000)
Subject: Merge "fix more merge issues" into experimental
X-Git-Tag: v1.3.0~1217^2~380^2~231
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6146612425ffc7523930e79ba43a253a7540693;p=libvpx

Merge "fix more merge issues" into experimental
---

f6146612425ffc7523930e79ba43a253a7540693