Merge branch 'master' into experimental

author John Koleszar <jkoleszar@google.com>

Tue, 11 Jun 2013 23:29:08 +0000 (16:29 -0700)

committer John Koleszar <jkoleszar@google.com>

Tue, 11 Jun 2013 23:29:28 +0000 (16:29 -0700)
author John Koleszar <jkoleszar@google.com>
Tue, 11 Jun 2013 23:29:08 +0000 (16:29 -0700)
committer John Koleszar <jkoleszar@google.com>
Tue, 11 Jun 2013 23:29:28 +0000 (16:29 -0700)
diff --cc build/make/Makefile
Simple merge
diff --cc build/make/configure.sh
Simple merge
diff --cc configure
Simple merge
diff --cc vp8/encoder/onyx_if.c
Simple merge
diff --cc vp9/vp9_dx_iface.c
Simple merge
diff --cc vpxdec.c
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Tue, 11 Jun 2013 23:29:08 +0000 (16:29 -0700)
committer	John Koleszar <jkoleszar@google.com>
	Tue, 11 Jun 2013 23:29:28 +0000 (16:29 -0700)
		1	2
build/make/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
build/make/configure.sh	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/vp9_dx_iface.c	patch \|	diff1 \|	diff2 \|	blob \| history
vpxdec.c	patch \|	diff1 \|	diff2 \|	blob \| history