Merge changes from 1.2 branch r456-468
Authored by: adustman 2007-02-11
Parent: [r469]
Child: [r471]