Merge remote branch 'origin/master' into experimental

author John Koleszar <jkoleszar@google.com>

Wed, 20 Jul 2011 04:05:16 +0000 (00:05 -0400)

committer John Koleszar <jkoleszar@google.com>

Wed, 20 Jul 2011 04:05:17 +0000 (00:05 -0400)
author John Koleszar <jkoleszar@google.com>
Wed, 20 Jul 2011 04:05:16 +0000 (00:05 -0400)
committer John Koleszar <jkoleszar@google.com>
Wed, 20 Jul 2011 04:05:17 +0000 (00:05 -0400)
diff --cc vp8/common/entropy.c
Simple merge
diff --cc vp8/decoder/detokenize.c
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Wed, 20 Jul 2011 04:05:16 +0000 (00:05 -0400)
committer	John Koleszar <jkoleszar@google.com>
	Wed, 20 Jul 2011 04:05:17 +0000 (00:05 -0400)
		1	2
vp8/common/entropy.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/decoder/detokenize.c	patch \|	diff1 \|	diff2 \|	blob \| history