Merge remote branch 'internal/upstream' into HEAD

author John Koleszar <jkoleszar@google.com>

Wed, 22 Sep 2010 04:05:04 +0000 (00:05 -0400)

committer John Koleszar <jkoleszar@google.com>

Wed, 22 Sep 2010 04:05:04 +0000 (00:05 -0400)
author John Koleszar <jkoleszar@google.com>
Wed, 22 Sep 2010 04:05:04 +0000 (00:05 -0400)
committer John Koleszar <jkoleszar@google.com>
Wed, 22 Sep 2010 04:05:04 +0000 (00:05 -0400)
diff --cc configure
Simple merge
diff --cc vp8/vp8_cx_iface.c
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Wed, 22 Sep 2010 04:05:04 +0000 (00:05 -0400)
committer	John Koleszar <jkoleszar@google.com>
	Wed, 22 Sep 2010 04:05:04 +0000 (00:05 -0400)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/vp8_cx_iface.c	patch \|	diff1 \|	diff2 \|	blob \| history