Fixing JDH's accidental removal of 1_0 branch
Authored by: mdboom 2010-10-12
Parent: [r8744]
Child: [r8746]