Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Thu, 3 Mar 2011 14:01:10 +0000 (09:01 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 3 Mar 2011 14:01:10 +0000 (09:01 -0500)
commit2c5638334ecb4fafc1ea9790ddf493d8d083ee4a
tree16552b3980b0a27ddb7a763e9dc538b75cf9cd68
parent1a7ce50a6c91af97291aa727483030a14a58859f
parent6f5189c044cf52171822f6df1ad6ae4a3bcaf2c4
Merge remote branch 'origin/master' into experimental

Conflicts:
vp8/vp8_cx_iface.c

Change-Id: Ib30d0cfbdaeb605ee4b846f683d204cd07e0c028
vp8/encoder/generic/csystemdependent.c
vp8/encoder/onyx_if.c
vp8/vp8_cx_iface.c