Giant rollup commit in preperation for 8.0-RC4
Authored by: jpaetzel 2011-03-31
Parent: [r5831]
Child: [r5833]