Johann e18d7bc230 Merge remote branch 'origin/master' into experimental ...

Conflicts:
	vp8/encoder/encodeframe.c
	vp8/encoder/rdopt.c

Change-Id: I8bab720889ac652361abdedfe2cc91a89742cb30

2011-06-17 14:56:27 -04:00

..

csystemdependent.c

Merge remote branch 'origin/master' into experimental

2011-06-17 14:56:27 -04:00