Merge remote branch 'internal/upstream' into HEAD

author John Koleszar <jkoleszar@google.com>

Wed, 17 Nov 2010 05:05:04 +0000 (00:05 -0500)

committer John Koleszar <jkoleszar@google.com>

Wed, 17 Nov 2010 05:05:04 +0000 (00:05 -0500)
author John Koleszar <jkoleszar@google.com>
Wed, 17 Nov 2010 05:05:04 +0000 (00:05 -0500)
committer John Koleszar <jkoleszar@google.com>
Wed, 17 Nov 2010 05:05:04 +0000 (00:05 -0500)
diff --cc configure
Simple merge
diff --cc vp8/encoder/onyx_int.h
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Wed, 17 Nov 2010 05:05:04 +0000 (00:05 -0500)
committer	John Koleszar <jkoleszar@google.com>
	Wed, 17 Nov 2010 05:05:04 +0000 (00:05 -0500)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/onyx_int.h	patch \|	diff1 \|	diff2 \|	blob \| history