Creation of a temporary branch to merge the changes from the 1.2 line into Chris MacRaild's branch.
Authored by: bugman 2006-04-05
Parent: [r2437]
Child: [r2439]