Merged with code from 1_4 branch (copy constructors).
Authored by: keess 2006-04-18
Parent: [r1535]
Child: [r1537]