Merge remote branch 'origin/master' into experimental

author John Koleszar <jkoleszar@google.com>

Tue, 25 Jan 2011 05:05:10 +0000 (00:05 -0500)

committer John Koleszar <jkoleszar@google.com>

Tue, 25 Jan 2011 05:05:10 +0000 (00:05 -0500)
author John Koleszar <jkoleszar@google.com>
Tue, 25 Jan 2011 05:05:10 +0000 (00:05 -0500)
committer John Koleszar <jkoleszar@google.com>
Tue, 25 Jan 2011 05:05:10 +0000 (00:05 -0500)
diff --cc vp8/encoder/encodeframe.c
Simple merge
diff --cc vp8/encoder/rdopt.c
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Tue, 25 Jan 2011 05:05:10 +0000 (00:05 -0500)
committer	John Koleszar <jkoleszar@google.com>
	Tue, 25 Jan 2011 05:05:10 +0000 (00:05 -0500)
		1	2
vp8/encoder/encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history