Merge remote branch 'internal/upstream' into HEAD

author John Koleszar <jkoleszar@google.com>

Tue, 30 Nov 2010 05:05:07 +0000 (00:05 -0500)

committer John Koleszar <jkoleszar@google.com>

Tue, 30 Nov 2010 05:05:07 +0000 (00:05 -0500)
author John Koleszar <jkoleszar@google.com>
Tue, 30 Nov 2010 05:05:07 +0000 (00:05 -0500)
committer John Koleszar <jkoleszar@google.com>
Tue, 30 Nov 2010 05:05:07 +0000 (00:05 -0500)
diff --cc vp8/vp8_cx_iface.c
Simple merge
diff --cc vpxenc.c
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Tue, 30 Nov 2010 05:05:07 +0000 (00:05 -0500)
committer	John Koleszar <jkoleszar@google.com>
	Tue, 30 Nov 2010 05:05:07 +0000 (00:05 -0500)
		1	2
vp8/vp8_cx_iface.c	patch \|	diff1 \|	diff2 \|	blob \| history
vpxenc.c	patch \|	diff1 \|	diff2 \|	blob \| history