Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Thu, 2 Jun 2011 04:05:12 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 2 Jun 2011 04:05:13 +0000 (00:05 -0400)
Change-Id: I993dbef81ca3d1638e16c4134aa8dc177e57875c

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

Simple merge
Simple merge