ref: 786246ebf1fd4b875f33a8b0c35bab2a3df911b3
parent: e18d7bc23095b89132007c64e38ce262dcb0a943
parent: 76495617e05d7192f887c688fa177fea77b9469b
author: Johann <johannkoenig@google.com>
date: Wed Jun 22 03:45:17 EDT 2011
Merge remote branch 'origin/master' into experimental Conflicts: vp8/encoder/rdopt.c Use new constant (110) from 10ed60dc7 Change-Id: Ic7d8a45ccc8deeeb94a0ab1c58d5d052ef3c27e4