ref: 44d35f7b257cc3e737a38eb9537d57c3e0479885
parent: c7ca3808322e4ff6a26d2184137c1dfa94f97024
parent: 297dc90255cf9511bea26c1056aa5e118dae9028
author: John Koleszar <jkoleszar@google.com>
date: Fri May 11 06:51:05 EDT 2012
Merge branch 'origin/eider' into master Conflicts: vp8/common/entropymode.c vp8/common/entropymode.h vp8/encoder/encodeframe.c vp8/vp8_cx_iface.c Change-Id: I708b0f30449b9502b382e47b745d56f5ed2ce265