John Koleszar 5f6db3591c Merge remote branch 'origin/master' into experimental ...

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

Change-Id: I4cc58acb432662d2c47aceda1680e52982adbc06

2011-03-23 00:24:25 -04:00

..

csystemdependent.c

Merge remote branch 'origin/master' into experimental

2011-03-23 00:24:25 -04:00