Diff pg-1.5.4-r1 with a pg-1.5.8

Thank you!