Fixes for the file paths to sync with the 1.3 line.
Authored by: bugman 2010-10-15
Parent: [r11638]
Child: [r11640]