Re-apply shader patches and some xml cleanup
Authored by: klaussfreire 2012-05-17
Parent: [r13384]
Child: [r13386]