Merge remote branch 'internal/upstream' into HEAD

author John Koleszar <jkoleszar@google.com>

Thu, 26 May 2011 15:44:58 +0000 (11:44 -0400)

committer John Koleszar <jkoleszar@google.com>

Thu, 26 May 2011 15:44:58 +0000 (11:44 -0400)
author John Koleszar <jkoleszar@google.com>
Thu, 26 May 2011 15:44:58 +0000 (11:44 -0400)
committer John Koleszar <jkoleszar@google.com>
Thu, 26 May 2011 15:44:58 +0000 (11:44 -0400)
diff --cc vp8/encoder/bitstream.c
Simple merge
diff --cc vp8/encoder/encodeframe.c
Simple merge
diff --cc vp8/encoder/rdopt.c
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Thu, 26 May 2011 15:44:58 +0000 (11:44 -0400)
committer	John Koleszar <jkoleszar@google.com>
	Thu, 26 May 2011 15:44:58 +0000 (11:44 -0400)
		1	2
vp8/encoder/bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history