ref: deb2e9cf620087b4dc5b78423b6ff9bf8971c1bc
parent: cefb915ab62a7cd91b347cc22449b2eb9b8c1df9
parent: a60fc419f50eefbef568ceecb93233471e894fa5
author: John Koleszar <jkoleszar@google.com>
date: Fri Jun 17 11:36:43 EDT 2011
Merge remote branch 'internal/upstream' into HEAD Conflicts: vp8/encoder/encodeframe.c vp8/encoder/rdopt.c Change-Id: I183fd3ce9e94617ec888c9f891055b9f1f8ca6c5