Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Sat, 19 Feb 2011 05:05:10 +0000 (00:05 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Sat, 19 Feb 2011 05:05:11 +0000 (00:05 -0500)
Change-Id: Ia3197f432b424213a34b20071e5171a413ba1aaf

1  2 
vp8/common/alloccommon.c
vp8/encoder/onyx_if.c

Simple merge
Simple merge