Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Sat, 28 May 2011 04:05:12 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Sat, 28 May 2011 04:05:12 +0000 (00:05 -0400)
Change-Id: Ie2a4927754a9c220b30a84fc7e1372e565fe9eec

1  2 
vp8/encoder/onyx_if.c
vp8/encoder/rdopt.c

Simple merge
Simple merge